feat(conditional-format): support conditional format #1681

Gggpound · 2024-03-25T03:32:12Z

No description provided.

codecov · 2024-03-25T03:35:32Z

Codecov Report

Attention: Patch coverage is 20.26838% with 2852 lines in your changes are missing coverage. Please review.

Project coverage is 31.62%. Comparing base (eabe6fb) to head (871fd06).

Files	Patch %	Lines
...-format/src/components/panel/rule-edit/iconSet.tsx	4.00%	168 Missing ⚠️
...al-format/src/components/panel/rule-list/index.tsx	1.78%	165 Missing ⚠️
...rmat/src/services/calculate-unit/highlight-cell.ts	35.06%	150 Missing ⚠️
...rmat/src/components/panel/rule-edit/colorScale.tsx	2.20%	133 Missing ⚠️
...t/src/components/panel/rule-edit/highlightCell.tsx	2.98%	130 Missing ⚠️
...-format/src/services/conditional-format.service.ts	48.30%	122 Missing ⚠️
...format/src/controllers/cf.copy-paste.controller.ts	0.84%	118 Missing ⚠️
...al-format/src/components/panel/rule-edit/index.tsx	2.72%	107 Missing ⚠️
...-format/src/components/panel/rule-edit/dataBar.tsx	2.75%	106 Missing ⚠️
...src/services/conditional-format-formula.service.ts	31.37%	105 Missing ⚠️
... and 59 more

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #1681      +/-   ##
==========================================
- Coverage   32.38%   31.62%   -0.76%     
==========================================
  Files         976     1039      +63     
  Lines       54179    57725    +3546     
  Branches    11286    12120     +834     
==========================================
+ Hits        17547    18258     +711     
- Misses      36632    39467    +2835

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2024-03-25T03:37:36Z

View Deployment

📑 Examples	📚 Storybook
🔗 Preview link	🔗 Preview link

wzhudev · 2024-03-26T06:05:23Z

packages/sheets-conditional-format/src/commands/commands/add-average-cf.command.ts

+    operator: IAverageHighlightCell['operator'];
+}
+//  { ranges: [{ startRow: 0, endRow: 10, startColumn: 3, endColumn: 3 }, { startRow: 0, endRow: 10, startColumn: 5, endColumn: 5 }], style: { fs: 30 }, operator: 'greaterThan' };
+export const addAverageCfCommand: ICommand<IAddAverageCfParams> = {


Command's name should start with a capical letter.

wzhudev · 2024-03-26T06:05:48Z

packages/sheets-conditional-format/src/commands/mutations/addConditionalRule.mutation.ts

+ * limitations under the License.
+ */
+
+import type { IMutation } from '@univerjs/core';


File name should be in kebab case.

wzhudev · 2024-03-26T06:06:15Z

packages/sheets-conditional-format/src/commands/operations/open-conditional-format-panel.ts

+    value: number;
+}
+
+export enum OPERATION {


The name should be more precise.

wzhudev · 2024-03-26T06:11:47Z

packages/sheets-conditional-format/src/commands/commands/add-average-cf.command.ts

+                                                 operator,
+                                                 style,
+                                             } };
+        commandService.executeCommand(addConditionalRuleMutation.id, { unitId, subUnitId, rule } as IAddConditionalRuleMutationParams);


Should return the result of executing addConditionalRuleMutation.

wzhudev · 2024-03-26T06:12:04Z

packages/sheets-conditional-format/src/commands/commands/add-cf.command.ts

+            });
+        }
+
+        return true;


return result

wzhudev · 2024-03-26T06:12:58Z

packages/sheets-conditional-format/src/commands/mutations/addConditionalRule.mutation.ts

+    subUnitId: string;
+    rule: IConditionFormatRule;
+}
+export const addConditionalRuleMutationUndoFactory = (accessor: IAccessor, param: IAddConditionalRuleMutationParams) => {


Factories' names should start with a capital letter.

wzhudev · 2024-03-26T06:15:35Z

packages/ui/src/views/components/doc-bars/ToolbarItem.tsx

@@ -109,7 +109,7 @@ export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem>, ref:

    const { selections } = props as IDisplayMenuItem<IMenuSelectorItem>;

-    const options = selections as IValueOption[];


Cannot use hooks with if logic.

wzhudev · 2024-03-26T06:18:31Z

packages/sheets-conditional-format/src/base/const.ts

+import type { IConditionFormatRule, ITextHighlightCell } from '../models/type';
+
+export const SHEET_CONDITION_FORMAT_PLUGIN = 'SHEET_CONDITION_FORMAT_PLUGIN';
+export enum TextOperator {


enum should have prefix in their names in avoid of conflicting with other features. For examples, auto filter has operators too.

wzhudev · 2024-03-26T06:23:55Z

packages/sheets-conditional-format/src/render/data-bar.render.ts

+        ctx.globalCompositeOperation = 'destination-over';
+        Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
+            const cellData = worksheet.getCell(row, col) as IDataBarCellData;
+            if (cellData && cellData.dataBar) {


Return earlier to make the code more readable.

wzhudev · 2024-03-26T06:26:15Z

packages/sheets-conditional-format/src/models/conditional-format-rule-model.ts

+ * limitations under the License.
+ */
+
+/**


Two license headers.

jikkai

LGTM

#486)

…onfiguration(#480)

Gggpound requested review from DR-Univer, Dushusir, jikkai, wzhudev and Jocs as code owners March 25, 2024 03:32

Gggpound changed the title ~~feat-conditional-format~~ feat(cf): support conditional format Mar 25, 2024

wzhudev requested changes Mar 26, 2024

View reviewed changes

wzhudev reviewed Mar 26, 2024

View reviewed changes

Gggpound force-pushed the gggpound/feat-conditional-format-0325 branch from b3c5573 to 8dc574d Compare March 26, 2024 12:02

Gggpound added feature request New feature or request qa:untested This PR is ready to be tested labels Mar 26, 2024

Gggpound force-pushed the gggpound/feat-conditional-format-0325 branch from 8dc574d to a1064e1 Compare March 26, 2024 12:17

jikkai approved these changes Mar 26, 2024

View reviewed changes

wzhudev removed the feature request New feature or request label Mar 27, 2024

wzhudev approved these changes Mar 27, 2024

View reviewed changes

Gggpound force-pushed the gggpound/feat-conditional-format-0325 branch 2 times, most recently from 81abc8b to 87d80d1 Compare March 27, 2024 14:21

jikkai changed the title ~~feat(cf): support conditional format~~ feat(conditional-format): support conditional format Mar 27, 2024

Gggpound added 9 commits March 28, 2024 14:14

feat(conditional-format): init

6872c20

feat(cf): init conditional format model

3e49024

fix(dev): fix dev config

5cf29f9

feat(cf): mark dirty when change conditional rule

36db398

feat(numfmt): support serial time to timestamp

b817954

feat(cf): support text number time operator

1f21ab4

feat(cf): add priority cache

606cc8e

feat(cf): change cfid type to string from number

b0310a2

fix(cf): diff value type

db010d0

Gggpound added 23 commits March 28, 2024 14:16

fix(cf): the settings for filtering errors (#475)

ee51b89

fix(cf): 0 can not be set (#472)

7493cc2

fix(cf): error highlighting result of custom formula (#468)

b44f036

fix(cf): numerical calculations add type checking (#458)

21eaff6

feat(cf): support clear (#433)

52233fd

feat(cf): select changes to update the rules panel(#437)

3e72007

fix(cf): 0 can not be set (#446)

97a3e52

fix(cf): the style of the filter condition format is set after editing (

b9357a1

#486)

feat(cf): data bar gradient color adds border

40b0437

feat(cf): formula support absolute ref

abbe770

fix(cf): rule list panel were not updated in a timely manner (#437)

c77c66d

feat(cf): number compare support mixed max and min

0d7aa56

feat(cf): support boolean compare (#461)

b13af5b

fix(cf): add input validation (#454)

e42fcc4

feat(cf): zenZone hide cf

5eb1c5d

fix(cf): error message does not disappear after update the icon set c…

a274eed

…onfiguration(#480)

test(core): add test case

3a7e870

style(cf): enum should have prefix

38ea582

fix(ui): do not use hook use if logic

94a841d

style(cf): rename

ae70186

test(cf): add color scale test case

6de4da8

fix(cf): not between support mixed max and min

06edeec

feat(cf): support empty icon

55d4a61

Gggpound force-pushed the gggpound/feat-conditional-format-0325 branch from 87d80d1 to 94dc6c1 Compare March 28, 2024 06:19

style(cf): ui

871fd06

Gggpound force-pushed the gggpound/feat-conditional-format-0325 branch from 94dc6c1 to 871fd06 Compare March 28, 2024 07:14

zhaolixin7 added the qa:verified This PR has already by verified by a QA and is considered good enough to be merge label Mar 28, 2024

univer-bot bot removed the qa:untested This PR is ready to be tested label Mar 28, 2024

Gggpound merged commit 50edd34 into dev Mar 28, 2024
8 checks passed

Gggpound deleted the gggpound/feat-conditional-format-0325 branch March 28, 2024 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(conditional-format): support conditional format #1681

feat(conditional-format): support conditional format #1681

Gggpound commented Mar 25, 2024

codecov bot commented Mar 25, 2024 •

edited

Loading

github-actions bot commented Mar 25, 2024 •

edited

Loading

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024 •

edited

Loading

wzhudev Mar 26, 2024

wzhudev Mar 26, 2024

jikkai left a comment

		@@ -109,7 +109,7 @@ export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem>, ref:

		const { selections } = props as IDisplayMenuItem<IMenuSelectorItem>;

		const options = selections as IValueOption[];

feat(conditional-format): support conditional format #1681

feat(conditional-format): support conditional format #1681

Conversation

Gggpound commented Mar 25, 2024

codecov bot commented Mar 25, 2024 • edited Loading

Codecov Report

github-actions bot commented Mar 25, 2024 • edited Loading

View Deployment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wzhudev Mar 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jikkai left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 25, 2024 •

edited

Loading

github-actions bot commented Mar 25, 2024 •

edited

Loading

wzhudev Mar 26, 2024 •

edited

Loading