From 11552e57eeb853dcd6310bfc9d650ac4a0997be2 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Fri, 15 Nov 2024 17:08:06 +0800 Subject: [PATCH 1/4] feat: support merge categories and groups in blocks --- designer-demo/registry.js | 15 +++++++- packages/plugins/block/index.js | 3 ++ packages/plugins/block/src/BlockConfig.vue | 19 +++++++--- packages/plugins/block/src/CategoryEdit.vue | 36 +++++++++++++++---- packages/plugins/block/src/Main.vue | 23 +++++++++--- packages/plugins/block/src/SaveNewBlock.vue | 7 ++-- .../plugins/block/src/composable/useBlock.js | 10 +++++- .../plugins/block/src/js/blockSetting.jsx | 34 +++++++++++++----- packages/plugins/block/src/js/http.js | 19 ++++++++++ 9 files changed, 138 insertions(+), 28 deletions(-) diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 45d09f154..20f4bc029 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -98,7 +98,20 @@ export default { Fullscreen, Lang ], - plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot], + plugins: [ + Materials, + Tree, + Page, + [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }], + Datasource, + Bridge, + I18n, + Script, + State, + Schema, + Help, + Robot + ], dsls: [{ id: 'engine.dsls.dslvue' }], settings: [Props, Styles, Events], canvas: Canvas diff --git a/packages/plugins/block/index.js b/packages/plugins/block/index.js index df70726dd..66e6967a0 100644 --- a/packages/plugins/block/index.js +++ b/packages/plugins/block/index.js @@ -20,6 +20,9 @@ export default { apis: api, entry, metas: [BlockService], + options: { + mergeCategoriesAndGroups: false + }, components: { SaveNewBlock } diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue index a5d36ba2b..7f7f8c172 100644 --- a/packages/plugins/block/src/BlockConfig.vue +++ b/packages/plugins/block/src/BlockConfig.vue @@ -24,12 +24,12 @@ > - + - - + + - + + @@ -46,7 +51,7 @@ import { REGEXP_GROUP_NAME } from '@opentiny/tiny-engine-common/js/verification' import { extend } from '@opentiny/vue-renderless/common/object' import { createOrUpdateCategory } from './js/blockSetting' -const { getGroupList } = useBlock() +const { getGroupList, shouldReplaceCategoryWithGroup } = useBlock() const props = defineProps({ modelValue: Boolean, @@ -55,6 +60,20 @@ const props = defineProps({ const emit = defineEmits(['update:modelValue']) +const groupLabels = shouldReplaceCategoryWithGroup() + ? { + text: '分组', + nameInput: '分组名称', + nameInputPlaceholder: '请输入分组名称', + validateErrMsg: '分组名称不能重复！' + } + : { + text: '分类', + nameInput: '分类名称', + nameInputPlaceholder: '请输入分类名称', + validateErrMsg: '分类名称不能重复！' + } + const state = reactive({ visible: false }) @@ -69,7 +88,7 @@ const formData = reactive({ name: '', categoryId: '' }) const validateGroup = (rule, value, callback) => { const isRepeat = props.initialValue?.name !== value && groupList.value.some((group) => group.name === value) if (isRepeat) { - callback(new Error('分类名称不能重复！')) + callback(new Error(groupLabels.validateErrMsg)) return } callback() @@ -86,6 +105,11 @@ const rules = reactive({ categoryId: [{ required: true, message: '必填', trigger: 'blur' }] }) +// 分组不需要填写表单id字段 +if (shouldReplaceCategoryWithGroup()) { + rules.categoryId = [] +} + const handleChangeName = (value) => { if (isEdit.value) { // 编辑时不允许修改id @@ -103,7 +127,7 @@ const handleChangeName = (value) => { formData.categoryId = id } -const title = computed(() => `${isEdit.value ? '编辑' : '新增'}分类`) +const title = computed(() => `${isEdit.value ? '编辑' : '新增'}${groupLabels.text}`) const closeDialog = () => { emit('update:modelValue', false) diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue index 7000b3f84..aa4a2d5c5 100644 --- a/packages/plugins/block/src/Main.vue +++ b/packages/plugins/block/src/Main.vue @@ -16,7 +16,7 @@ ref="groupSelect" v-model="state.categoryId" popper-class="block-popper" - placeholder="默认展示全部分类" + :placeholder="groupLabels.selectPlaceholder" filterable :filter-method="categoryFilter" clearable @@ -48,7 +48,7 @@
- 您确定删除该区块分类吗？ + {{ groupLabels.deletePrompt }}
{ - let params = { categoryId: val } + let params = useBlock().shouldReplaceCategoryWithGroup() ? { groupId: val } : { categoryId: val } if (!val) { params = {} @@ -349,7 +361,7 @@ export default { const deleteItem = (item) => { confirm({ - title: '删除分类', + title: groupLabels.deleteTitle, status: 'custom', message: { render() { @@ -423,7 +435,8 @@ export default { handleChangeDeletePopoverVisible, handleSelectVisibleChange, externalBlock, - docsUrl + docsUrl, + groupLabels } } } diff --git a/packages/plugins/block/src/SaveNewBlock.vue b/packages/plugins/block/src/SaveNewBlock.vue index 28fdb0476..40b71a9dd 100644 --- a/packages/plugins/block/src/SaveNewBlock.vue +++ b/packages/plugins/block/src/SaveNewBlock.vue @@ -24,7 +24,7 @@ - + @@ -67,7 +67,7 @@ export default { name_cn: '', group: '' }) - const { createEmptyBlock, createBlock, getCategoryList } = useBlock() + const { createEmptyBlock, createBlock, getCategoryList, shouldReplaceCategoryWithGroup } = useBlock() const visible = computed(() => props.boxVisibility) const { PLUGIN_NAME, activePlugin } = useLayout() const { isSaved } = useCanvas() @@ -127,7 +127,8 @@ export default { addBlock, cancel, changeCategory, - visible + visible, + shouldReplaceCategoryWithGroup } } } diff --git a/packages/plugins/block/src/composable/useBlock.js b/packages/plugins/block/src/composable/useBlock.js index 09e67ac8a..664ced65a 100644 --- a/packages/plugins/block/src/composable/useBlock.js +++ b/packages/plugins/block/src/composable/useBlock.js @@ -27,8 +27,10 @@ import { getMetaApi, META_APP, getMergeMeta, + getOptions, META_SERVICE } from '@opentiny/tiny-engine-meta-register' +import meta from '../../meta' const { SORT_TYPE, SCHEMA_DATA_TYPE, BLOCK_OPENNESS } = constants @@ -715,6 +717,11 @@ const getBlockAssetsByVersion = (block, version) => { return assets } +const shouldReplaceCategoryWithGroup = () => { + const { mergeCategoriesAndGroups } = getOptions(meta.id) + return mergeCategoriesAndGroups +} + export default function () { return { NODE_TYPE_PAGE, @@ -758,6 +765,7 @@ export default function () { removePropertyLink, getBlockProperties, getBlockPageSchema, - getDateFromNow + getDateFromNow, + shouldReplaceCategoryWithGroup } } diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx index 490ada401..98120dd3a 100644 --- a/packages/plugins/block/src/js/blockSetting.jsx +++ b/packages/plugins/block/src/js/blockSetting.jsx @@ -42,7 +42,11 @@ import { fetchCategories, createCategory, updateCategory, - deleteCategory + deleteCategory, + fetchGroups, + createGroup, + updateGroup, + deleteGroup } from './http' import { constants, utils } from '@opentiny/tiny-engine-utils' import { generateBlock } from '@opentiny/tiny-engine-common/js/vscodeGenerateFile' @@ -588,7 +592,9 @@ const getAppId = () => getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id const getCategories = () => { const appId = getAppId() - fetchCategories({ appId }).then((res) => { + const fetchData = useBlock().shouldReplaceCategoryWithGroup() ? fetchGroups : fetchCategories + + fetchData({ appId }).then((res) => { useBlock().setCategoryList(res) }) } @@ -643,6 +649,14 @@ const updateBlock = (block = {}) => { label } = block const nameCn = 'name_cn' + + const extraParams = {} + if (useBlock().shouldReplaceCategoryWithGroup()) { + extraParams.groups = categories + } else { + extraParams.categories = categories + } + requestUpdateBlock( id, { @@ -652,9 +666,9 @@ const updateBlock = (block = {}) => { public_scope_tenants, public: publicType, tags, - categories: categories.map((category) => category.id), description, - label + label, + ...extraParams }, { params: { @@ -777,11 +791,14 @@ export const getBlockById = async (id) => { export const createOrUpdateCategory = async ({ categoryId, ...params }, isEdit) => { const appId = getAppId() params.app = Number(appId) - let requestFunc = updateCategory + const replaceCategoryWithGroup = useBlock().shouldReplaceCategoryWithGroup() + let requestFunc = replaceCategoryWithGroup ? updateGroup : updateCategory if (!isEdit) { - params.category_id = categoryId - requestFunc = createCategory + if (!replaceCategoryWithGroup) { + params.category_id = categoryId + } + requestFunc = replaceCategoryWithGroup ? createGroup : createCategory } const res = await requestFunc(params) @@ -792,7 +809,8 @@ export const createOrUpdateCategory = async ({ categoryId, ...params }, isEdit) } export const delCategory = async (id) => { - const res = await deleteCategory(id) + const deleteFn = useBlock().shouldReplaceCategoryWithGroup() ? deleteGroup : deleteCategory + const res = await deleteFn(id) if (res) { getCategories() diff --git a/packages/plugins/block/src/js/http.js b/packages/plugins/block/src/js/http.js index caf0019f9..df978f670 100644 --- a/packages/plugins/block/src/js/http.js +++ b/packages/plugins/block/src/js/http.js @@ -75,3 +75,22 @@ export const createCategory = (params) => // 删除区块分类 export const deleteCategory = (id) => getMetaApi(META_SERVICE.Http).delete(`/material-center/api/block-categories/${id}`) + +// 下面是区块分组的增删查改接口 +// 当 Block 插件的 options.mergeCategoriesAndGroups 为 true 时，将分类的接口全部替换成分组的接口 + +// 区块分组列表 +export const fetchGroups = (params) => + getMetaApi(META_SERVICE.Http).get(`/material-center/api/block-groups`, { params }) + +// 更新区块分组 +export const updateGroup = ({ id, ...params }) => + getMetaApi(META_SERVICE.Http).post(`/material-center/api/block-groups/update/${id}`, params) + +// 新建区块分组 +export const createGroup = (params) => + getMetaApi(META_SERVICE.Http).post('/material-center/api/block-groups/create', { ...params, from: 'block' }) + +// 删除区块分组 +export const deleteGroup = (groupId) => + getMetaApi(META_SERVICE.Http).get(`/material-center/api/block-groups/delete/${groupId}`) From 6c730df27afd666d25f4ebefbd4374868205dc61 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Mon, 18 Nov 2024 15:19:40 +0800 Subject: [PATCH 2/4] add extra param to groups get request --- packages/plugins/block/src/js/http.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugins/block/src/js/http.js b/packages/plugins/block/src/js/http.js index df978f670..ceefbb0a9 100644 --- a/packages/plugins/block/src/js/http.js +++ b/packages/plugins/block/src/js/http.js @@ -81,7 +81,7 @@ export const deleteCategory = (id) => // 区块分组列表 export const fetchGroups = (params) => - getMetaApi(META_SERVICE.Http).get(`/material-center/api/block-groups`, { params }) + getMetaApi(META_SERVICE.Http).get(`/material-center/api/block-groups`, { params: { ...params, from: 'block' } }) // 更新区块分组 export const updateGroup = ({ id, ...params }) => @@ -89,7 +89,7 @@ export const updateGroup = ({ id, ...params }) => // 新建区块分组 export const createGroup = (params) => - getMetaApi(META_SERVICE.Http).post('/material-center/api/block-groups/create', { ...params, from: 'block' }) + getMetaApi(META_SERVICE.Http).post('/material-center/api/block-groups/create', params) // 删除区块分组 export const deleteGroup = (groupId) => From df0f50c9fc4a7799b356db671f12087ca8b6e461 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Wed, 20 Nov 2024 10:56:57 +0800 Subject: [PATCH 3/4] fix create block error --- packages/plugins/block/src/js/blockSetting.jsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx index 98120dd3a..fab130ef8 100644 --- a/packages/plugins/block/src/js/blockSetting.jsx +++ b/packages/plugins/block/src/js/blockSetting.jsx @@ -603,7 +603,17 @@ const getCategories = () => { const createBlock = (block = {}) => { const { message } = useModal() const created_app = getAppId() - const params = { ...block, created_app } + + const { categories, ...rest } = block + const extraParams = {} + + if (useBlock().shouldReplaceCategoryWithGroup()) { + extraParams.groups = categories + } else { + extraParams.categories = categories + } + + const params = { ...rest, ...extraParams, created_app } if (isVsCodeEnv) { const id = getMaterialHistory()?.id From f057a11f82cf7a33c4e14faf17b0dea8c6ecd366 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Thu, 21 Nov 2024 09:48:18 +0800 Subject: [PATCH 4/4] undo changes in registry.js --- designer-demo/registry.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 20f4bc029..45d09f154 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -98,20 +98,7 @@ export default { Fullscreen, Lang ], - plugins: [ - Materials, - Tree, - Page, - [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }], - Datasource, - Bridge, - I18n, - Script, - State, - Schema, - Help, - Robot - ], + plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot], dsls: [{ id: 'engine.dsls.dslvue' }], settings: [Props, Styles, Events], canvas: Canvas