Skip to content

fix: 修复当画布没有内容时控制台报错以及一个提示文案修改 #26

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.

Sign up for GitHub

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

Merged
wenmine merged 2 commits into from
Oct 13, 2023
Merged

fix: 修复当画布没有内容时控制台报错以及一个提示文案修改 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d7ded9
feat: 修复当画布没有内容时控制台报错
lhuans Oct 10, 2023
672fdd1
Merge branch 'develop' of github.com:opentiny/tiny-engine into lhs/fi…
lhuans Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/canvas/src/components/render/RenderMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const setState = (data, clear) => {
Object.assign(state, parseData(data, {}, getContext()) || {})

// 在状态变量合并之后，执行访问器中watchEffect，为了可以在访问器函数中可以访问其他state变量
Object.entries(data)?.forEach(([key, stateData]) => {
Object.entries(data || {})?.forEach(([key, stateData]) => {
if (isStateAccessor(stateData)) {
const accessor = stateData.accessor
if (accessor?.getter?.value) {
Expand Down
2 changes: 1 addition & 1 deletion packages/toolbars/logo/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<tiny-tooltip
class="item"
effect="dark"
content="是否需要生成工程的默认配置，如package.json等文件。如果选择的为否，只会生成页面对应的代码。不会生成一些配置文件。"
content="是否生成工程默认配置，如package.json等文件。如选择为否，只生成页面对应代码，不生成配置文件。"
placement="top"
popper-class="help-tooltip"
>
Expand Down