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.

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

fix: optimize block code saving and publishing logic #996

Open
wants to merge 5 commits into
base: refactor/develop
Choose a base branch
from
Open

fix: optimize block code saving and publishing logic #996

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d43b739
fix: resolve the block publish logic
SonyLeo Jan 7, 2025
acca71f
fix: add judgment conditions.
SonyLeo Jan 7, 2025
2b2a8af
fix: optimize judgement condition and return code
SonyLeo Jan 7, 2025
b7e350f
fix: simplify judgement conditions
SonyLeo Jan 8, 2025
a870123
fix: optimize the function writing.
SonyLeo Jan 9, 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
14 changes: 12 additions & 2 deletions packages/common/component/BlockDeployDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</template>

<script>
import { reactive, ref, watch } from 'vue'
import { reactive, ref, watch, computed } from 'vue'
import {
Checkbox as TinyCheckbox,
Input as TinyInput,
Expand All @@ -81,7 +81,7 @@ import {
Popover as TinyPopover,
FormItem as TinyFormItem
} from '@opentiny/vue'
import { useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
import { useBlock, useCanvas, useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
import { constants } from '@opentiny/tiny-engine-utils'
import VueMonaco from './VueMonaco.vue'

Expand Down Expand Up @@ -172,6 +172,13 @@ export default {

const setVisible = (visible) => emit('update:visible', visible)

const { setSaved } = useCanvas()

const isSameBlock = computed(() => {
SonyLeo marked this conversation as resolved.
Show resolved Hide resolved
const currentBlock = useBlock().getCurrentBlock()
return props.block?.id === currentBlock?.id
})

const deployBlock = async () => {
deployBlockRef.value.validate((valid) => {
const { publishBlock } = getMetaApi(META_APP.BlockManage)
Expand All @@ -186,6 +193,9 @@ export default {
}
publishBlock(params)
setVisible(false)
if (formState.needToSave && isSameBlock.value) {
setSaved(true)
}
formState.deployInfo = ''
formState.version = ''
formState.needToSave = true
Expand Down
4 changes: 4 additions & 0 deletions packages/plugins/block/src/js/blockSetting.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,10 @@ const updateBlock = (block = {}) => {
* @returns
*/
const generateBlockDeps = (children, deps = { scripts: [], styles: new Set() }) => {
if (!Array.isArray(children)) {
return
}

children.forEach((child) => {
const component = useMaterial().getMaterial(child.componentName)

Expand Down
Loading