diff --git a/hangtag-ui/hangtag-ui-admin/src/api/base/keyword/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/base/keyword/index.ts new file mode 100644 index 0000000..873b185 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/api/base/keyword/index.ts @@ -0,0 +1,24 @@ +import request from '@/config/axios' + + +// 关键字 API +export const KeywordApi = { + + /** + * 查询关键字列表 + * @param filter 前置过滤 + * @param type AbsBaseKeywordSearchHandler 实现类的bean名称 + * @param keyword 关键字 + * @param maxCount 最大数量 + */ + list: async (filter: string, type: string, keyword: string, maxCount = 10) => { + return await request.get({ + url: `/oms/base/keyword/list/${type}/${maxCount}`, + params: { + filter: filter, + keyword: keyword, + } + }) + }, + +} diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/Dialog.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/Dialog.vue index 7d41a73..0e8e16f 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/Dialog.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/Dialog.vue @@ -10,6 +10,7 @@ const props = defineProps({ title: propTypes.string.def('Dialog'), fullscreen: propTypes.bool.def(false), width: propTypes.oneOfType([String, Number]).def('40%'), + top: propTypes.oneOfType([String]).def('2%'), scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话,按照 maxHeight 设置最大高度 maxHeight: propTypes.oneOfType([String, Number]).def('400px') }) @@ -63,6 +64,7 @@ const dialogStyle = computed(() => { :close-on-click-modal="true" :fullscreen="isFullscreen" :width="width" + :top="top" destroy-on-close lock-scroll draggable diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue index 385e811..1dc1972 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue @@ -29,8 +29,26 @@ + + + + + + + diff --git a/hangtag-ui/hangtag-ui-front/src/components/Dialog/src/Dialog.vue b/hangtag-ui/hangtag-ui-front/src/components/Dialog/src/Dialog.vue index 7d41a73..0e8e16f 100644 --- a/hangtag-ui/hangtag-ui-front/src/components/Dialog/src/Dialog.vue +++ b/hangtag-ui/hangtag-ui-front/src/components/Dialog/src/Dialog.vue @@ -10,6 +10,7 @@ const props = defineProps({ title: propTypes.string.def('Dialog'), fullscreen: propTypes.bool.def(false), width: propTypes.oneOfType([String, Number]).def('40%'), + top: propTypes.oneOfType([String]).def('2%'), scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话,按照 maxHeight 设置最大高度 maxHeight: propTypes.oneOfType([String, Number]).def('400px') }) @@ -63,6 +64,7 @@ const dialogStyle = computed(() => { :close-on-click-modal="true" :fullscreen="isFullscreen" :width="width" + :top="top" destroy-on-close lock-scroll draggable