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

Release v2.2.0 merge #1085

Merged
merged 23 commits into from
Jan 26, 2025
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e32b9b3
v2.2.0-beta.0
chilingling Jan 16, 2025
33a42f8
fix: remove pnpm cache for release workflow
chilingling Jan 16, 2025
d2fc9b1
v2.2.0-beta.1
chilingling Jan 16, 2025
bacd299
fix: fix the error of routing bar caused by invalid pageid (#1045)
gene9831 Jan 16, 2025
61aa180
fix(chore): output build log to tmp directory
chilingling Jan 17, 2025
97efa2a
v2.2.0-beta.2
chilingling Jan 17, 2025
9d0af81
fix: update template bundle (#1048)
yy-wow Jan 17, 2025
e0e657b
fix: Release github action syntax issue
chilingling Jan 17, 2025
04459f3
v2.2.0-beta.3
chilingling Jan 17, 2025
dd8ae42
v2.2.0-rc.0
chilingling Jan 17, 2025
4b9a681
fix: mock utils axios cdn link
yy-wow Jan 23, 2025
5162ab4
fix(plugins/materials): fix new app with no page should not set url p…
rhlin Jan 23, 2025
fe04e1b
fix(canvas/render): fix edited page not refresh on children page, fix…
rhlin Jan 23, 2025
d8c78bd
fix: AI chat request error (#1059)
gene9831 Jan 23, 2025
48f25c6
fix: Delete prompt box (#1068)
xuanlid Jan 24, 2025
2d47b79
fix: parent form field in page settings do not display (#1069)
gene9831 Jan 25, 2025
b5789c5
v2.2.0-rc.1 (#1077)
hexqi Jan 26, 2025
bfc9fea
fix(block): fix block not refresh when curd & block deploy bugs (#1080)
betterdancing Jan 26, 2025
c04ec56
fix: preview failure (#1079)
lichunn Jan 26, 2025
07509fd
fix:Optimize JS page style (#1081)
SonyLeo Jan 26, 2025
8e6896e
fix: fix data source type display exception (#1082)
SonyLeo Jan 26, 2025
3452517
v2.2.0 (#1084)
hexqi Jan 26, 2025
1edcfad
Merge branch 'refactor/develop' into release-v2.2.0-merge
hexqi Jan 26, 2025
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
Prev Previous commit
Next Next commit
fix:Optimize JS page style (#1081)
SonyLeo authored Jan 26, 2025
commit 07509fd1686c37ed875038099963a8371dbfa251
12 changes: 9 additions & 3 deletions packages/common/component/SvgButton.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="$emit('click', $event)">
<span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="handleClick($event)">
<tiny-tooltip effect="dark" :content="tips" :placement="placement">
<component :is="name" v-if="isTinyIcon" />
<svg-icon v-else :name="name"></svg-icon>
@@ -34,11 +34,17 @@ export default {
}
},
emits: ['click'],
setup(props) {
setup(props, { emit }) {
const isTinyIcon = computed(() => props.name.toLowerCase().indexOf('icon') === 0)

const handleClick = (event) => {
event.target.blur()
emit('click', event)
}

return {
isTinyIcon
isTinyIcon,
handleClick
}
}
}
13 changes: 8 additions & 5 deletions packages/plugins/script/src/Main.vue
Original file line number Diff line number Diff line change
@@ -59,12 +59,11 @@ export default {
enabled: false
},
placeholder: `// ✅ 函数声明可以保存
\n function topLevelFunction(){ \n
\u200B \u200B const message = 'hello tiny-engine.' \n
function topLevelFunction(){
\u200B \u200B const message = 'hello tiny-engine.'
\u200B \u200B console.log(message)
\n }
\n
// ❌ 顶层/常规 变量声明 \n const someVariable = 42 \n
} \n
// ❌ 顶层/常规 变量声明 \n const someVariable = 42
// ❌ 表达式 \n const result = someVariable + 10`,

// 禁用滚动条边边一直显示的边框
@@ -185,4 +184,8 @@ export default {
margin-left: 5px;
}
}

:deep(.monaco-editor .editorPlaceholder) {
font-size: 12px !important;
}
</style>
Loading