diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue index 55546e4..f9df902 100644 --- a/src/components/Tree/src/BasicTree.vue +++ b/src/components/Tree/src/BasicTree.vue @@ -418,7 +418,7 @@ return () => { const { title, helpMessage, toolbar, search, checkable } = props; const showTitle = title || toolbar || search || slots.headerTitle; - const scrollStyle: CSSProperties = { height: 'calc(100% - 38px)' }; + const scrollStyle: CSSProperties = { height: 'calc(100% - 38px)', paddingTop: '6px' }; return (
{showTitle && ( diff --git a/src/components/Tree/src/components/TreeHeader.vue b/src/components/Tree/src/components/TreeHeader.vue index 97ae5c7..fad016b 100644 --- a/src/components/Tree/src/components/TreeHeader.vue +++ b/src/components/Tree/src/components/TreeHeader.vue @@ -29,6 +29,7 @@ +
diff --git a/src/views/common/workflow/extension/form/index.vue b/src/views/common/workflow/extension/form/index.vue index e08ad2c..572f4e5 100644 --- a/src/views/common/workflow/extension/form/index.vue +++ b/src/views/common/workflow/extension/form/index.vue @@ -7,14 +7,48 @@ >
+ > + + +
import { defineComponent, reactive, toRaw, onMounted } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listFormDefinition, delFormDefinition } from '/@/api/platform/common/workflow/extension/controller/formDefinition'; + import { + listFormDefinition, + delFormDefinition, + getFormDefinition, + } from '/@/api/platform/common/workflow/extension/controller/formDefinition'; import { PageWrapper } from '/@/components/Page'; import { BasicTree, TreeItem } from '/@/components/Tree'; import { useModal } from '/@/components/Modal'; @@ -84,6 +122,7 @@ import { useMessage } from '/@/hooks/web/useMessage'; import { listToTree } from '/@/utils/helper/treeHelper'; import { listFormCategory } from '/@/api/platform/common/workflow/extension/controller/formCategory'; + import { PlusOutlined, FormOutlined, DeleteOutlined } from '@ant-design/icons-vue'; /** 类型规范统一声明定义区域 */ interface TableState { @@ -102,6 +141,9 @@ BasicTree, TableAction, FormModal, + PlusOutlined, + FormOutlined, + DeleteOutlined, }, setup() { @@ -121,7 +163,7 @@ const { createConfirm, createMessage } = useMessage(); const [registerModal, { openModal }] = useModal(); const [registerResetPwdModal, { openModal: openResetPwdModal }] = useModal(); - const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ + const [registerTable, { reload, clearSelectedRowKeys, getForm }] = useTable({ title: '流程表单列表', api: listFormDefinition, rowKey: 'id', @@ -195,8 +237,9 @@ } function handleSelect(selectedKeys: string[]) { - state.searchInfo.categoryId = selectedKeys[0]; - handleRefreshTable(); + getForm().setFieldsValue({ + categoryId: selectedKeys[0] + }); } return { @@ -214,3 +257,23 @@ } }); +