From 4522dd09f381ff1081483ed864d89744cb7070dd Mon Sep 17 00:00:00 2001 From: katherinehhh Date: Thu, 9 May 2024 14:25:15 +0800 Subject: [PATCH] style: add child action style improve (#4289) * style: add child style improve * refactor: tree table * fix: bug * refactor: code improve --- .../add-child/CreateChildInitializer.tsx | 2 +- .../schema-component/antd/table-v2/Table.tsx | 2 +- .../components/CreateRecordAction.tsx | 45 +------------------ 3 files changed, 4 insertions(+), 45 deletions(-) diff --git a/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx b/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx index f9c4b81d9e..3e9dda84e4 100644 --- a/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx +++ b/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx @@ -22,7 +22,7 @@ export const CreateChildInitializer = (props) => { openMode: 'drawer', type: 'link', addChild: true, - style: { padding: '0px', marginTop: '-5px' }, + style: { height: 'auto', lineHeight: 'normal' }, component: 'CreateRecordAction', }, properties: { diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx index fed5ebf1bd..80918cafd2 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx @@ -454,7 +454,7 @@ export const Table: any = withDynamicSchemaProps( if (!_.isEqual(newExpandesKeys, expandedKeys)) { setExpandesKeys(newExpandesKeys); } - }, [expandFlag, allIncludesChildren]); + }, [expandFlag]); /** * 为没有设置 key 属性的表格行生成一个唯一的 key diff --git a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx index 5503f0b506..76c9e13fca 100644 --- a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx +++ b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx @@ -8,7 +8,6 @@ */ import { DownOutlined } from '@ant-design/icons'; -import { css } from '@emotion/css'; import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react'; import { Button, Dropdown, MenuProps } from 'antd'; import React, { useEffect, useMemo, useState, forwardRef, createRef } from 'react'; @@ -26,46 +25,6 @@ import { linkageAction } from '../../schema-component/antd/action/utils'; import { parseVariables } from '../../schema-component/common/utils/uitls'; import { useLocalVariables, useVariables } from '../../variables'; -export const actionDesignerCss = css` - position: relative; - &:hover { - .general-schema-designer { - display: block; - } - } - .general-schema-designer { - position: absolute; - z-index: 999; - top: 0; - bottom: 0; - left: 0; - right: 0; - display: none; - background: var(--colorBgSettingsHover); - border: 0; - top: 0; - bottom: 0; - left: 0; - right: 0; - pointer-events: none; - > .general-schema-designer-icons { - position: absolute; - right: 2px; - top: 2px; - line-height: 16px; - pointer-events: all; - .ant-space-item { - background-color: var(--colorSettings); - color: #fff; - line-height: 16px; - width: 16px; - padding-left: 1px; - align-self: stretch; - } - } - } -`; - export function useAclCheck(actionPath) { const aclCheck = useAclCheckFn(); return aclCheck(actionPath); @@ -138,7 +97,7 @@ const InternalCreateRecordAction = (props: any, ref) => { const buttonRef = composeRef(ref, internalRef); return ( //@ts-ignore -
}> +
}> +