Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 隐藏画布根节点的包裹元素的操作选项 #492

Merged
merged 1 commit into from
Aug 24, 2024

Conversation

gene9831
Copy link
Collaborator

@gene9831 gene9831 commented May 17, 2024

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

Background and solution

pr #259 合并后,画布根节点使用div包裹了一层,来自定义根节点的样式

What is the current behavior?

当根节点样式设置了margin时,选中根节点div会展示出操作选项,实际上这些操作选项是无效的。(根节点无法移动、复制、删除)
image

What is the new behavior?

隐藏根节点div的操作选项
image

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

  • New Features
    • Enhanced the canvas component to improve condition checks for better action visibility.
    • Added a unique identifier to the root container in the rendering logic for improved node selection.

Copy link
Contributor

coderabbitai bot commented May 17, 2024

Walkthrough

The recent updates introduce conditional checks and unique property additions to enhance the functionality and robustness of the CanvasAction.vue and RenderMain.js components. Specifically, the CanvasAction.vue component now includes a condition related to the schema property before setting the showAction computed property. Additionally, RenderMain.js has been updated to include a unique 'data-id': 'root-container' property to the props object in the rootChildrenSchema, aiding in better node selection logic.

Changes

File Path Change Summary
.../canvas/src/components/container/CanvasAction.vue Added a check for schema property in showAction computed property and updated getCurrent to include schema.
.../canvas/src/components/render/RenderMain.js Added a unique property 'data-id': 'root-container' to the props object in rootChildrenSchema.

In the land where code does flow,
A rabbit's joy begins to grow.
With schema checks and IDs clear,
The canvas shines, a path sincere.
Hopping through the fields of change,
Each update makes the code arrange.
🌸✨🐇


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 6d9241e and 17829ab.
Files selected for processing (2)
  • packages/canvas/src/components/container/CanvasAction.vue (1 hunks)
  • packages/canvas/src/components/render/RenderMain.js (1 hunks)
Additional comments not posted (2)
packages/canvas/src/components/render/RenderMain.js (1)

383-383: Ensure the new 'data-id' property does not interfere with existing functionality.

Verification successful

The new 'data-id' property added to the root node in RenderMain.js does not interfere with existing functionality. The usages of 'data-id' in CanvasAction.vue and PropertyList.vue are contextually distinct and should not cause any conflicts.

  • In CanvasAction.vue, the 'data-id' property is used in a conditional check to determine if the schema's 'data-id' is 'root-container'.
  • In PropertyList.vue, the 'data-id' property is used in a v-for directive to set a custom attribute on list items.

Both usages are compatible with the new property addition.

Scripts Executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Description: Verify that the new 'data-id' property does not interfere with existing functionality.

# Test: Search for any potential conflicts or issues caused by the new property.
rg --type javascript $'data-id'

Length of output: 65



Script:

#!/bin/bash
# Description: Verify that the new 'data-id' property does not interfere with existing functionality.

# Test: Search for any potential conflicts or issues caused by the new property.
rg --type js 'data-id'

Length of output: 413



Script:

#!/bin/bash
# Extract the relevant code snippet from CanvasAction.vue where 'data-id' is used.
rg --type vue 'data-id' -A 5 -B 5 packages/canvas/src/components/container/CanvasAction.vue

# Extract the relevant code snippet from PropertyList.vue where 'data-id' is used.
rg --type vue 'data-id' -A 5 -B 5 packages/settings/design/src/components/PropertyList.vue

Length of output: 238



Script:

#!/bin/bash
# Extract the relevant code snippet from CanvasAction.vue where 'data-id' is used.
rg 'data-id' -A 5 -B 5 packages/canvas/src/components/container/CanvasAction.vue

# Extract the relevant code snippet from PropertyList.vue where 'data-id' is used.
rg 'data-id' -A 5 -B 5 packages/settings/design/src/components/PropertyList.vue

Length of output: 813

packages/canvas/src/components/container/CanvasAction.vue (1)

231-234: Ensure the new logic correctly hides operation options for the root node without affecting other functionalities.

@gene9831 gene9831 added bug Something isn't working ready_for_review This PR requires more reviews labels May 17, 2024
@hexqi hexqi merged commit c218724 into opentiny:develop Aug 24, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working ready_for_review This PR requires more reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants