Skip to content

Resolve router page merge conflict#1003

Merged
gene9831 merged 35 commits intoopentiny:feat/router-pagefrom
rhlin:resolve-router-page-merge-conflict
Jan 8, 2025
Merged

Resolve router page merge conflict#1003
gene9831 merged 35 commits intoopentiny:feat/router-pagefrom
rhlin:resolve-router-page-merge-conflict

Conversation

@rhlin
Copy link
Collaborator

@rhlin rhlin commented Jan 8, 2025

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: Merge conflict resolve

Background and solution

从2.0拉的分支，2.1代码有较大的变化， 预解决和2.1版本之间 冲突

What is the current behavior?

冲突无法合入

Issue Number: N/A

What is the new behavior?

解决冲突，主体功能验证正常

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

chilingling and others added 30 commits December 12, 2024 09:44
@chilingling
v2.0.0 (opentiny#934)
eee70e1
@chilingling
fix: slot should extra params (opentiny#919)
923ad6c 
* fix: slot should extra params

* fix: add unit test case

* fix: change test schema fileName
@wenmine
feat(theme): change datasource and setting panel theme variable
e1806b3 
1. 对齐数据源、右侧属性面板的全部模块变量
2. 将数据源和属性面板部分文件里的变量滥用调整先调整为common变量
@gene9831
feat: support checking all blocks in material add block panel (openti…
0a308db 
…ny#923)

物料插件-区块分组-添加区块，区块列表没有全选功能

改动点：
1. 给区块列表添加全选功能
2. 抽取了一个 SelectAll 组件到 common 包
@gene9831
fix: optimize bind-i18n styles (opentiny#925)
5e6e6a5 
优化属性面板绑定国际化UI
@betterdancing
fix(style-panel): resolve style-panel styles issue (opentiny#924)
6b20d26 
1. 调整了tabsGroupConfigurator组件的一些颜色问题；
2. 修改所有大写的PX为小写；
3. 工具栏中调整屏幕大小的组件的弹窗内容样式全部丢失，重写了这部分样式；
4. TinyGrid组件的表格列编辑弹窗样式丢失，重写了这部分；
5. 属性面板和样式面板部分Label色值不对，统一修改；
6. 样式面板原有引用的部分颜色变量失效，重新替换；
@chilingling
fix: preview should not overwrite mainFile (opentiny#920)
230b334
@xuanlid
fix: Modify UI review comments (opentiny#916)
eb76a70 
* fix:Modify Code Font in bridge/state

* fix:modify the block list style in block

* fix:Modify schema panel style

* fix:Modify tabs in materials

* fix:Modify global dialog, modal and search

* fix:Modify the component list style in materials

* fix:Modify button style

* fix:Modify search in i18n

* fix: Modify UI in Schema Panel

* fix:Modify dialog style and i18n Panel shadow

* fix:Modify the component list style in materials

* fix:Modify the block list style in block

* fix: Modify modal style

* fix: Modify modal in clean

* fix: Modify modal in block

* fix: Modify the block list and modal in block

* fix: modify the block list in block

* fix: modify font size

* fix: Modify global button

* fix: delete comment code

* fix: change plugin-icon-js.svg
@gene9831
feat: Support merging categories and groups (opentiny#907)
7360072 
* feat: support merge categories and groups in blocks

* add extra param to groups get request

* fix create block error

* undo changes in registry.js

* fix: Fixed the problem of using function references directly for conditional judgment
@lichunn
feat：UI specification adjustment (opentiny#938)
9f9447d 
* feat: 添加页面初始间距

* feat: 调整间距配置

* feat: 调整样式面板字体交互

* feat: 调整CanvasRowColContainer组件间距

* feat: 画布页面添加背景色

* feat: 区块组件添加间距

* feat: 添加样式字符串转对象方法

* feat: 添加基础样式类

* feat:添加弹性盒子组件

* feat: 调整flexBox组件

* feat: 增加Section组件以及清空画布保留基础样式

* fix:样调整时增加基础类名判断

* fix：修复在样式面板选择样式时，两个类名同时改动

* fix：调整容器默认内容样式

* fix:容器组件名以及属性改为中文
@chilingling
feat: schemaDataAsync (opentiny#885)
cff74bb 
* feat: schemaDataAsync

* fix: adapt schema plugin

* fix: add import export schema

* fix: remove useless code

* fix: shcmea change cant't trigger canvas rerender

* fix: replace setSchema

* refactor: schema data sync to canvas

* refactor: change synchoronized method between canvas and host

* fix: remove useless node tree

* fix: support recursive update attr

* feat: support recursive update nodesMap

* fix: selectNode updateRect conflict

* refactor: sync update to schemaService

* feat: migrade canvas collection

* fix: dataSourceMap update

* feat: add docs

* fix: add direct change schema api doc

* fix: use toRaw optimize performance

* fix: add default fallback for changeProps

* fix: schema update issue

* fix: add compatible for empty children

* fix: provide schemaUtils to canvas

* fix: update collection table data

* fix: add error handling
@chilingling @hexqi
feat: blockCompiler (opentiny#906)
7716dda 
* feat: blockCompiler

* feat: block compile to blobURL

* feat: block-compiler

* fix: add dev alias

* fix: del unnecessary comments

* feat: del old block web component logic

* fix: scope id error

* feat: del umd block support

* feat: del block deploy progress bar

* feat: del block progress request

* fix: del customElement relative logic

* feat: add block loading and error status view

* fix: select blockSchema by historyid

* fix: block schema should select by version

* feat: add block compile cache

* fix: add source code cache

* fix: add default material import map

* feat: update builtin-component version

* feat(block-compiler): support compile jsx

* feat: support block compileCache

* feat: update block version slient refresh

* fix: update @vue/babel-plusin-jsx version

* fix: type checking

* fix: typescript build error

* fix: imporve type checking

* feat: use new block compile cache realize

* fix(block-compiler): remove deps order check

* fix: use has method check the specified key exists in the map instead of get method

* fix: optimize deps

* fix: update cache name params

---------

Co-authored-by: hexqi <wu_12556@126.com>
@yy-wow
Fix: preview URL (opentiny#966)
9027902
@gene9831
fix: fix param type error when create group (opentiny#985)
8fabfcc
@hexqi @chilingling
chore: update version to 2.1.0-rc.0 (opentiny#947)
a6b7892
@chilingling
feat: add pull request base branch release/* (opentiny#954)
18bb652
@chilingling
fix: chore bug fix for v2.1 (opentiny#953)
403620b 
1. 修复清空画布报错的 bug
2. 修复区块加载错误的 bug
3. 修复画布拖拽组件到最前面的时候，组件会消失的  bug
@chilingling
fix: resolve some schema update issue (opentiny#956)
028b808 
* fix: resolve some schema update issue

1. 调整画布宽度时，画布选中框不及时更新的 bug
2. 空页面的时候，拖拽组件到画布提示两次新建页面的 bug
3. importSchema 的时候，清空选择
4. 页面 schema 保存的时候，设置保存状态为 false
5. 增强 AdvanceConfig 配置对 props 的容错

* fix: updateRect async change to callback style

* fix: first time enter app should show empty page warning
@chilingling
fix: resolve warnings (opentiny#957)
a05459b 
* fix: resolve warnings

* fix: add access guard avoid runtime errors

* fix: change placeholder prop type

* fix: resolve type check

* fix: toolbarbaseicon props default value
@chilingling @hexqi
fix: time asc add i18n failed (opentiny#976)
77ec192 
* fix: time asc add i18n failed

* fix: search invalid

---------

Co-authored-by: hexqi <wu_12556@126.com>
@chilingling
fix: basePropsGroup use deepclone prevent clone array itself (opentin…
132f3e8 
…y#975)

* fix: basePropsGroup use deepclone prevent clone array itself

basePropsGroup 使用深拷贝方式复制自身

* fix: filter duplicated property
@chilingling
fix: generate code accessor scenario (opentiny#972)
80359a1 
* fix: generate code accessor scenario

修复 state  accessor 出码的bug

* fix: objectVal gettter value
@chilingling
fix: blockPublishLogic (opentiny#973)
af552d0 
* fix: breadcrumb publish block cannot get correct version

* fix: block schema change sync

* fix: del useless comment code

* fix: hide publish block button when creating block
@chilingling
fix: blockCompile get correct version (opentiny#964)
55d1f75 
* fix: blockCompile get correct version

* fix: support refresh block selected version

* fix: clear all compileCache

* fix: use correct version key to find history schema

* fix: add id for stylesheet

* fix: clean style sheet when remove cache

* fix: should remove stylesheet before clean cache
@zhangjuncao @chilingling
fix:modify style (opentiny#981)
c6ce763
@SonyLeo @chilingling
fix: optimize save code button marker position (opentiny#982)
884f988 
* fix: optimize save code button marker position

* fix: resolve point style issues for page Schema and page JS
@hexqi @chilingling
fix: update cli template resolve preview error (opentiny#983)
dc71923 
更新 cli 模板
@chilingling
fix: block switch select property failed (opentiny#984)
ff5048d 
* fix: block switch select property failed

* fix: del assignment
@chilingling @hexqi
fix: resolve block property issue (opentiny#971)
7847ab5 
* fix: resolve block property issue

* fix: block property form rename

---------

Co-authored-by: hexqi <wu_12556@126.com>
@chilingling
fix: cannot publish current editing block (opentiny#987)
e3f3339
chilingling and others added 5 commits January 2, 2025 23:26
@chilingling @hexqi
fix: preview page breadcrumb don't exist useBlock method and preview …
4fea04b 
…block error when type undefined (opentiny#988)

* fix: preview breadcrumb don't exist useBlock method

* fix: resolve block preview error when type is undefined

---------

Co-authored-by: hexqi <wu_12556@126.com>
@chilingling
v2.1.0
b38af9f
@xuanlid
fix: Modify UI review comments (opentiny#941)
15597a1 
* fix:Modify Code Font in bridge/state

* fix:modify the block list style in block

* fix:Modify schema panel style

* fix:Modify tabs in materials

* fix:Modify global dialog, modal and search

* fix:Modify the component list style in materials

* fix:Modify search in i18n

* fix: Modify UI in Schema Panel

* fix:Modify dialog style and i18n Panel shadow

* fix:Modify the component list style in materials

* fix:Modify the block list style in block

* fix: Modify UI review comments in i18n

* fix: Modify modal style

* fix: Modify modal in clean

* fix: Modify modal in block

* fix: Modify the block list and modal in block

* fix: modify the block list in block

* fix: modify font size

* fix: Modify global button

* fix: delete comment code

* fix: change plugin-icon-js.svg

* fix:Modify Code Font in bridge/state

* fix:Modify button in header

* fix: Modify button in state

* fix:Modify Font Size in datasource

* fix: Modify icon in lifecycle/blockEvent

* fix: Modify validate in dialog

* fix: modify second-panel and tree styles

* fix: Modify tree componentType

* fix: Modify the fixed column style of the table

* fix: Modify top save and more

* fix:Modify code style in state

* fix:Modify the block list in block

* fix: Modify remote panel

* fix: Modify the icon to tips and gray background

* fix:Modify global popover and toolTip

* fix:Modify open-delay to a constant
@xuanlid
fix:Modify panel shadow color (opentiny#943)
a14a508
@rhlin
Merge remote-tracking branch 'upstream/refactor/develop' into resolve…
3bc9d33 
…-router-page-merge-conflict
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 8, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (3)
  • refactor/develop
  • ospp-*
  • release/*

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

@rhlin
Copy link
Collaborator Author

rhlin commented Jan 8, 2025 •
edited
Loading

注意不可以用squash合入/rebase合入 ，需要用Merge， 保持merge的主干的内容commit号不变

@Issues-translate-bot
Copy link

Issues-translate-bot commented Jan 8, 2025

Bot detected the issue body's language is not English, translate it automatically.

Note that you cannot use squash to merge

@gene9831 gene9831 merged commit 5a9253a into opentiny:feat/router-page Jan 8, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.