Skip to content

feat: add refresh material api #1320

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
hexqi merged 3 commits into from
Apr 27, 2025
Merged

feat: add refresh material api #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd8b25f
feat: add refresh material api
chilingling Apr 19, 2025
cade3b5
fix: material.component lose reactive because of destructuring
chilingling Apr 21, 2025
208fe3f
fix: support duplicated group on same component
chilingling Apr 22, 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
13 changes: 11 additions & 2 deletions packages/plugins/materials/src/composable/useMaterial.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,9 @@ const addComponentSnippets = (componentSnippets, snippetsData) => {
if (snippetsMap.has(snippetGroup.group)) {
snippetsMap.get(snippetGroup.group).children.push(...snippetGroup.children)
} else {
snippetsData.push(snippetGroup)
const snippetGroupClone = deepClone(snippetGroup)
snippetsData.push(snippetGroupClone)
snippetsMap.set(snippetGroup.group, snippetGroupClone)
}
})

Expand Down Expand Up @@ -486,6 +488,12 @@ const initMaterial = ({ isInit = true, appData = {} } = {}) => {
}
}

const refreshMaterial = async () => {
clearMaterials()
initMaterial()
await fetchMaterial()
}

/**
* 根据组名获取指定分组组件
* @param {Array} components 所有组件
Expand Down Expand Up @@ -526,6 +534,7 @@ export default function () {
getBlockCompileRes,
addBlockResources,
updateBlockCompileCache,
getComponentsByGroup
getComponentsByGroup,
refreshMaterial
}
}
21 changes: 15 additions & 6 deletions packages/plugins/materials/src/meta/component/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</template>

<script lang="ts">
import { inject, onMounted, reactive, ref, watchEffect } from 'vue'
import { inject, onMounted, reactive, ref, watch, watchEffect } from 'vue'
import { Collapse, CollapseItem, Search } from '@opentiny/vue'
import { SearchEmpty, CanvasDragItem } from '@opentiny/tiny-engine-common'
import i18n from '@opentiny/tiny-engine-common/js/i18n'
Expand All @@ -57,7 +57,6 @@ export default {
const { generateNode, materialState, getComponentsByGroup } = useMaterial()
const gridTemplateColumns = ref(COMPONENT_PANEL_COLUMNS)
const panelState = inject('panelState', {})
const { components } = materialState
const { locale } = i18n.global

const fetchComponents = (components, name) => {
Expand Down Expand Up @@ -91,10 +90,10 @@ export default {
const initComponents = () => {
const groupName = panelState.materialGroup
if (groupName) {
return getComponentsByGroup(components, groupName)
return getComponentsByGroup(materialState.components, groupName)
}

return components
return materialState.components
}

const state = reactive({
Expand All @@ -104,13 +103,23 @@ export default {
})

watchEffect(() => {
state.activeName = [...Array(components.length).keys()]
state.activeName = [...Array(materialState.components.length).keys()]
})

const change = (value) => {
state.components = fetchComponents(components, value)
state.components = fetchComponents(materialState.components, value)
}

watch(
() => materialState.components,
(value) => {
state.components = fetchComponents(value, state.searchValue)
},
{
deep: true
}
)

const componentClick = (data) => {
const { isShortcutPanel, emitEvent } = panelState
const { addComponent } = useCanvas().canvasApi.value
Expand Down