Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(sheets-data-validation): use tailwindcss to rewrite the style of data-validation (#5089)
ZhangWeifb4bec4c5cf2
diff --git a/packages/sheets-data-validation-ui/src/views/components/detail/index.module.less b/packages/sheets-data-validation-ui/src/views/components/detail/index.module.lessdeleted file mode 100644index 17c9c703e2..0000000000--- a/packages/sheets-data-validation-ui/src/views/components/detail/index.module.less+++ /dev/null@@ -1,18 +0,0 @@-.data-validation-detail {- padding: var(--padding-base) 0;-- &-form-item {- width: 100%;- }-- &-buttons {- margin-top: 20px;- display: flex;- flex-direction: row;- justify-content: flex-end;- }-- &-button {- margin-left: 12px;- }-}diff --git a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsxindex 9d7361bb87..127ae4fe9b 100644--- a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx@@ -25,12 +25,10 @@ import { SheetsSelectionsService } from '@univerjs/sheets';import { RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand } from '@univerjs/sheets-data-validation';import { RangeSelector } from '@univerjs/sheets-formula-ui';import { ComponentManager, useDependency, useEvent, useObservable } from '@univerjs/ui';-import React, { useEffect, useMemo, useRef, useState } from 'react';+import { useEffect, useMemo, useRef, useState } from 'react';import { DataValidationPanelService } from '../../../services/data-validation-panel.service';import { DataValidationOptions } from '../options';-import styles from './index.module.less';-// debounce execute commands, for better redo-undo experienceconst debounceExecuteFactory = (commandService: ICommandService) => debounce(async (id: string, params?: any, options?: IExecutionOptions | undefined, callback?: (success: boolean) => void) => {@@ -250,7 +248,7 @@ export function DataValidationDetail() {const shouldHideFormula = operators.length && !localRule.operator;return (- <div className={styles.dataValidationDetail}>+ <div className="univer-py-4"><FormLayoutlabel={localeService.t('dataValidation.panel.range')}error={(!localRule.ranges.length || isRangeError) ? localeService.t('dataValidation.panel.rangeError') : ''}@@ -276,19 +274,27 @@ export function DataValidationDetail() {</FormLayout><FormLayout label={localeService.t('dataValidation.panel.type')}><Select+ className="univer-w-full"+ value={localRule.type}+ onChange={handleChangeType}options={validators?.sort((a, b) => a.order - b.order)?.map((validator) => ({label: localeService.t(validator.title),value: validator.id,}))}- value={localRule.type}- onChange={handleChangeType}- className={styles.dataValidationDetailFormItem}/></FormLayout>{operators?.length? (<FormLayout label={localeService.t('dataValidation.panel.operator')}><Select+ className="univer-w-full"+ value={`${localRule.operator}`}+ onChange={(operator) => {+ handleUpdateRuleSetting({+ ...baseRule,+ operator: operator as DataValidationOperator,+ });+ }}options={[{value: '',@@ -299,14 +305,6 @@ export function DataValidationDetail() {label: operatorNames[i],})),]}- value={`${localRule.operator}`}- onChange={(operator) => {- handleUpdateRuleSetting({- ...baseRule,- operator: operator as DataValidationOperator,- });- }}- className={styles.dataValidationDetailFormItem}/></FormLayout>)@@ -348,11 +346,11 @@ export function DataValidationDetail() {</Checkbox></FormLayout><DataValidationOptions value={options} onChange={handleUpdateRuleOptions} extraComponent={validator.optionsInput} />- <div className={styles.dataValidationDetailButtons}>- <Button className={styles.dataValidationDetailButton} onClick={handleDelete}>+ <div className="univer-mt-5 univer-flex univer-flex-row univer-justify-end">+ <Button className="univer-ml-3" onClick={handleDelete}>{localeService.t('dataValidation.panel.removeRule')}</Button>- <Button className={styles.dataValidationDetailButton} variant="primary" onClick={handleOk}>+ <Button className="univer-ml-3" variant="primary" onClick={handleOk}>{localeService.t('dataValidation.panel.done')}</Button></div>diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/BaseFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/BaseFormulaInput.tsxindex cd6ba60ea4..2f68286f6a 100644--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/BaseFormulaInput.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/BaseFormulaInput.tsx@@ -18,7 +18,6 @@ import type { IFormulaInputProps } from '@univerjs/data-validation';import { LocaleService } from '@univerjs/core';import { FormLayout, Input } from '@univerjs/design';import { useDependency } from '@univerjs/ui';-import styles from './index.module.less';export const BaseFormulaInput = (props: IFormulaInputProps) => {const { isTwoFormula = false, value, onChange, showError, validResult } = props;@@ -31,7 +30,7 @@ export const BaseFormulaInput = (props: IFormulaInputProps) => {<><FormLayout error={formula1Res}><Input- className={styles.dataValidationFormula}+ className="univer-w-full"placeholder={localeService.t('dataValidation.panel.formulaPlaceholder')}value={value?.formula1}onChange={(newValue) => {@@ -42,12 +41,12 @@ export const BaseFormulaInput = (props: IFormulaInputProps) => {}}/></FormLayout>- <div className={styles.dataValidationFormulaAnd}>+ <div className="-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400">{localeService.t('dataValidation.panel.formulaAnd')}</div><FormLayout error={formula2Res}><Input- className={styles.dataValidationFormula}+ className="univer-w-full"placeholder={localeService.t('dataValidation.panel.formulaPlaceholder')}value={value?.formula2}onChange={(newValue) => {@@ -65,7 +64,7 @@ export const BaseFormulaInput = (props: IFormulaInputProps) => {return (<FormLayout error={formula1Res}><Input- className={styles.dataValidationFormula}+ className="univer-w-full"placeholder={localeService.t('dataValidation.panel.formulaPlaceholder')}value={value?.formula1}onChange={(newValue) => {diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsxindex 892351c838..8db874b424 100644--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx@@ -19,7 +19,6 @@ import { LocaleService } from '@univerjs/core';import { Checkbox, FormLayout, Input } from '@univerjs/design';import { useDependency } from '@univerjs/ui';import React, { useState } from 'react';-import styles from './index.module.less';export function CheckboxFormulaInput(props: IFormulaInputProps) {const { value, onChange, showError, validResult } = props;@@ -54,7 +53,7 @@ export function CheckboxFormulaInput(props: IFormulaInputProps) {? (<FormLayout label={localeService.t('dataValidation.checkbox.checked')} error={formula1Res}><Input- className={styles.dataValidationFormula}+ className="univer-w-full"placeholder={localeService.t('dataValidation.panel.valuePlaceholder')}value={value?.formula1}onChange={(newValue) => {@@ -71,7 +70,7 @@ export function CheckboxFormulaInput(props: IFormulaInputProps) {? (<FormLayout label={localeService.t('dataValidation.checkbox.unchecked')} error={formula2Res}><Input- className={styles.dataValidationFormula}+ className="univer-w-full"placeholder={localeService.t('dataValidation.panel.valuePlaceholder')}value={value?.formula2}onChange={(newValue) => {diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsxindex 5db613410d..1439f34a6e 100644--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx@@ -28,7 +28,6 @@ import { useDependency, useEvent, useObservable, useSidebarClick } from '@univerimport { useEffect, useMemo, useRef, useState } from 'react';import { debounceTime } from 'rxjs';import { DROP_DOWN_DEFAULT_COLOR } from '../../../const';-import styles from './index.module.less';const DEFAULT_COLOR_PRESET = ['#FFFFFF',@@ -80,18 +79,26 @@ const ColorSelect = (props: IColorSelectProps) => {onDropdownVisibleChange={setOpen}dropdownStyle={{ width: 112 }}style={{ width: 96, cursor: 'pointer' }}- className={styles.dataValidationFormulaColorSelect}+ className="univer-ml-1 univer-mr-2 univer-w-[92px]"value={value}onChange={onChange}labelRender={(item) => (<div- className={styles.dataValidationFormulaColorItem}+ className={`+ univer-box-border univer-h-4 univer-w-4 univer-rounded univer-border univer-border-gray-200+ univer-text-base+ `}style={{ background: item.value, marginTop: 5 }}/>)}dropdownRender={() => {return (- <div className={styles.dataValidationFormulaColorSelectPanel}>+ <div+ className={`+ univer-box-border univer-flex univer-w-28 univer-flex-row univer-flex-wrap+ univer-justify-between univer-p-3 univer-pl-3+ `}+ >{DEFAULT_COLOR_PRESET.map((color) => (<div@@ -99,7 +106,11 @@ const ColorSelect = (props: IColorSelectProps) => {onChange(color);setOpen(false);}}- className={styles.dataValidationFormulaColorItem}+ className={`+ univer-mb-2 univer-mr-2 univer-box-border univer-box-border univer-h-4 univer-w-4+ univer-cursor-pointer univer-rounded univer-border univer-border-gray-200+ univer-text-base+ `}style={{ background: color }}key={color}/>@@ -117,10 +128,10 @@ const Template = (props: { item: IDropdownItem; commonProps: any; style?: CSSProconst { onItemChange, onItemDelete } = commonProps;return (- <div className={styles.dataValidationFormulaListItem} style={style}>+ <div className="univer-flex univer-items-center univer-pb-0.5" style={style}>{!item.isRef? (- <div className={clsx(styles.dataValidationFormulaListItemDrag, 'draggableHandle')}>+ <div className={clsx('univer-cursor-move', 'draggableHandle')}><SequenceSingle /></div>)@@ -142,7 +153,12 @@ const Template = (props: { item: IDropdownItem; commonProps: any; style?: CSSPro{item.isRef? null: (- <div className={styles.dataValidationFormulaListItemIcon}>+ <div+ className={`+ univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base+ hover:univer-bg-gray-200+ `}+ ><DeleteSingle onClick={() => onItemDelete(item.id)} /></div>)}@@ -392,8 +408,15 @@ export function ListFormulaInput(props: IFormulaInputProps) {)}idKey="id"/>- <a className={styles.dataValidationFormulaListAdd} onClick={handleAdd}>- <IncreaseSingle />+ <a+ className={`+ univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center+ univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary+ hover:univer-bg-primary-600/5+ `}+ onClick={handleAdd}+ >+ <IncreaseSingle className="univer-mr-1" />{localeService.t('dataValidation.list.add')}</a></div>diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/index.module.less b/packages/sheets-data-validation-ui/src/views/components/formula-input/index.module.lessdeleted file mode 100644index 2e7993d217..0000000000--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/index.module.less+++ /dev/null@@ -1,84 +0,0 @@-.data-validation-formula {- width: 100%;-- &-and {- margin-top: -8px;- margin-bottom: 4px;- font-size: var(--font-size-sm);- color: rgba(var(--grey-400));- }-- &-list-item {- display: flex;- padding-bottom: 2px;- align-items: center;-- &-icon {- font-size: 16px;- cursor: pointer;- margin-left: 4px;- border-radius: 4px;- }-- &-icon:hover {- background: rgba(var(--grey-100));- }-- &-drag {- cursor: move;- }- }-- &-list-add {- color: #274fee;- font-size: 13px;- font-weight: 400;- cursor: pointer;- display: flex;- flex-direction: row;- align-items: center;- border-radius: 4px;- padding: 4px 8px;- width: fit-content;-- svg {- margin-right: 4px;- }- }-- &-list-add:hover {- background: rgba(39, 79, 238, 0.05);- }-- &-color-select {- width: 92px;- margin-left: 4px;- margin-right: 8px;- }-- &-color-select-panel {- width: 112px;- display: flex;- flex-direction: row;- justify-content: space-between;- padding: 12px 4px 4px 12px;- flex-wrap: wrap;- box-sizing: border-box;-- .data-validation-formula-color-item {- margin-bottom: 8px;- margin-right: 8px;- box-sizing: border-box;- cursor: pointer;- }- }-- &-color-item {- border-radius: 3px;- border: 1px solid rgba(var(--grey-400));- width: 16px;- height: 16px;- box-sizing: border-box;- font-size: 16px;- }-}diff --git a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx b/packages/sheets-data-validation-ui/src/views/components/item/index.tsxindex d267863f08..5e1ad53013 100644--- a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx@@ -17,13 +17,13 @@import type { ISheetDataValidationRule } from '@univerjs/core';import { ColorKit, ICommandService, ThemeService } from '@univerjs/core';import { DataValidatorRegistryService } from '@univerjs/data-validation';+import { clsx } from '@univerjs/design';import { serializeRange } from '@univerjs/engine-formula';import { DeleteSingle } from '@univerjs/icons';import { RemoveSheetDataValidationCommand } from '@univerjs/sheets-data-validation';import { IMarkSelectionService } from '@univerjs/sheets-ui';import { useDependency, useObservable } from '@univerjs/ui';import React, { useEffect, useMemo, useRef, useState } from 'react';-import styles from './index.module.less';export interface IDataValidationDetailProps {rule: ISheetDataValidationRule;@@ -72,7 +72,17 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {return (<div- className={styles.dataValidationItemContainer}+ className={clsx(+ `+ univer-rounded-md univer-bg-secondary univer-relative univer--ml-2 univer--mr-2 univer-box-border+ univer-flex univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between+ univer-overflow-hidden univer-rounded-lg univer-p-2 univer-pr-9+ `,+ {+ 'hover:univer-bg-gray-50': !disable,+ 'univer-opacity-50': disable,+ }+ )}onClick={onClick}onMouseEnter={() => {if (disable) return;@@ -91,15 +101,31 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {ids.current = undefined;}}>- <div className={styles.dataValidationItemTitle}>+ <div+ className={`+ univer-overflow-hidden univer-text-ellipsis univer-text-sm univer-font-medium univer-leading-[22px]+ univer-text-black+ `}+ >{validator?.generateRuleName(rule)}</div>- <div className={styles.dataValidationItemContent}>+ <div+ className={`+ univer-text-secondary univer-overflow-hidden univer-text-ellipsis univer-text-xs univer-leading-[18px]+ `}+ >{rule.ranges.map((range) => serializeRange(range)).join(',')}</div>{isHover? (- <div className={styles.dataValidationItemIcon} onClick={handleDelete}>+ <div+ className={`+ univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5+ univer-items-center univer-justify-center univer-rounded+ hover:univer-bg-gray-200+ `}+ onClick={handleDelete}+ ><DeleteSingle /></div>)diff --git a/packages/sheets-data-validation-ui/src/views/components/list/index.module.less b/packages/sheets-data-validation-ui/src/views/components/list/index.module.lessdeleted file mode 100644index bdfdf72fe9..0000000000--- a/packages/sheets-data-validation-ui/src/views/components/list/index.module.less+++ /dev/null@@ -1,14 +0,0 @@-.data-validation-list {- padding: var(--padding-base) 0;-- &-buttons {- margin-top: 20px;- display: flex;- flex-direction: row;- justify-content: flex-end;- }-- &-button {- margin-left: 12px;- }-}diff --git a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx b/packages/sheets-data-validation-ui/src/views/components/list/index.tsxindex 92a2bd54ec..e41e63786e 100644--- a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/list/index.tsx@@ -24,7 +24,6 @@ import { useDependency, useObservable } from '@univerjs/ui';import React, { useEffect, useState } from 'react';import { DataValidationPanelService } from '../../../services/data-validation-panel.service';import { DataValidationItem } from '../item';-import styles from './index.module.less';export function DataValidationList(props: { workbook: Workbook }) {const sheetDataValidationModel = useDependency(SheetDataValidationModel);@@ -97,7 +96,7 @@ export function DataValidationList(props: { workbook: Workbook }) {const hasDisableRule = rulesByPermissionCheck?.some((rule) => rule.disable);return (- <div className={styles.dataValidationList}>+ <div className="univer-pb-4">{rulesByPermissionCheck?.map((rule) => (<DataValidationItemunitId={unitId}@@ -115,15 +114,16 @@ export function DataValidationList(props: { workbook: Workbook }) {disable={rule.disable ?? false}/>))}- <div className={styles.dataValidationListButtons}>+ <div className="univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2">+{(rules.length && !hasDisableRule)? (- <Button className={styles.dataValidationListButton} onClick={handleRemoveAll}>+ <Button onClick={handleRemoveAll}>{localeService.t('dataValidation.panel.removeAll')}</Button>): null}- <Button className={styles.dataValidationListButton} variant="primary" onClick={handleAddRule}>+ <Button variant="primary" onClick={handleAddRule}>{localeService.t('dataValidation.panel.add')}</Button></div>diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.module.less b/packages/sheets-data-validation-ui/src/views/components/options/index.module.lessdeleted file mode 100644index 164fa7034f..0000000000--- a/packages/sheets-data-validation-ui/src/views/components/options/index.module.less+++ /dev/null@@ -1,15 +0,0 @@-.data-validation-options {- &-button {- cursor: pointer;- margin-bottom: 12px;- font-size: var(--font-size-sm);- color: rgba(var(--color-black));- display: flex;- align-items: center;-- &-icon {- font-size: 8px;- margin-left: 4px;- }- }-}diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx b/packages/sheets-data-validation-ui/src/views/components/options/index.tsxindex e53b7bd97d..c491b0615d 100644--- a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx@@ -20,7 +20,6 @@ import { Checkbox, FormLayout, Input, Radio, RadioGroup } from '@univerjs/designimport { MoreDownSingle, MoreUpSingle } from '@univerjs/icons';import { ComponentManager, useDependency } from '@univerjs/ui';import React, { useState } from 'react';-import styles from './index.module.less';export interface IDataValidationOptionsParams {value: IDataValidationRuleOptions;@@ -38,9 +37,20 @@ export function DataValidationOptions(props: IDataValidationOptionsParams) {return (<>- <div className={styles.dataValidationOptionsButton} onClick={() => setShow(!show)}>+ <div+ className={`+ univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-black+ `}+ onClick={() => setShow(!show)}+ >{localeService.t('dataValidation.panel.options')}- {show ? <MoreUpSingle className={styles.dataValidationOptionsButtonIcon} /> : <MoreDownSingle className={styles.dataValidationOptionsButtonIcon} />}+ {show+ ? (+ <MoreUpSingle className="univer-ml-1 univer-text-[8px]" />+ )+ : (+ <MoreDownSingle className="univer-ml-1 univer-text-[8px]" />+ )}</div>{show && (<>