@hw-component/table 1.9.39 → 1.9.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintcache +1 -1
- package/es/HTableBody/index.d.ts +1 -1
- package/es/HTableHeader/hooks/config.d.ts +1 -1
- package/es/HTableHeader/hooks/useHeaderDefaultProps.d.ts +1 -1
- package/es/HTableHeader/hooks/useHideMoreTitle.d.ts +3 -3
- package/es/hooks/useCurrentTable.js +4 -1
- package/es/modal.d.ts +1 -1
- package/es/render/Text.d.ts +1 -0
- package/lib/HTableBody/index.d.ts +1 -1
- package/lib/HTableHeader/hooks/config.d.ts +1 -1
- package/lib/HTableHeader/hooks/useHeaderDefaultProps.d.ts +1 -1
- package/lib/HTableHeader/hooks/useHideMoreTitle.d.ts +3 -3
- package/lib/hooks/useCurrentTable.js +4 -1
- package/lib/modal.d.ts +1 -1
- package/lib/render/Text.d.ts +1 -0
- package/package.json +1 -1
- package/src/components/DialogTable/hooks.ts +10 -10
- package/src/components/HTableBody/index.tsx +4 -3
- package/src/components/HTableHeader/hooks/config.tsx +35 -35
- package/src/components/HTableHeader/hooks/useHeaderDefaultProps.ts +33 -25
- package/src/components/HTableHeader/hooks/useHideMoreTitle.tsx +146 -152
- package/src/components/HTableHeader/index.tsx +21 -7
- package/src/components/hooks/useCurrentTable.ts +4 -1
- package/src/components/modal.ts +1 -1
- package/src/components/render/config.tsx +3 -3
- package/src/pages/DwTable/index.tsx +7 -5
- package/src/pages/Table/index.tsx +3 -2
|
@@ -6,8 +6,7 @@ import type { IHeaderProps } from "./modal";
|
|
|
6
6
|
import useHeaderDefaultProps from "./hooks/useHeaderDefaultProps";
|
|
7
7
|
import { HeaderProvider } from "./Context";
|
|
8
8
|
import { useHTableConfigContext } from "../TableConfig";
|
|
9
|
-
import useHideMoreTitle from
|
|
10
|
-
|
|
9
|
+
import useHideMoreTitle from "./hooks/useHideMoreTitle";
|
|
11
10
|
|
|
12
11
|
const defaultSearchSpan = {
|
|
13
12
|
xxl: 4,
|
|
@@ -23,11 +22,24 @@ export default ({
|
|
|
23
22
|
onReset,
|
|
24
23
|
...props
|
|
25
24
|
}: IHeaderProps) => {
|
|
26
|
-
const {
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
const {
|
|
26
|
+
tableLabelWidth,
|
|
27
|
+
tableInstance,
|
|
28
|
+
subOnFinish,
|
|
29
|
+
submitLoading,
|
|
30
|
+
tableHideLabel,
|
|
31
|
+
headerConfigData,
|
|
32
|
+
} = useHeaderDefaultProps(props);
|
|
33
|
+
const { form } = tableInstance;
|
|
34
|
+
const nConfigData = useHideMoreTitle({
|
|
35
|
+
searchSpan,
|
|
36
|
+
configData: headerConfigData,
|
|
37
|
+
table: tableInstance,
|
|
38
|
+
});
|
|
29
39
|
const className = useClassName("hw-table-header");
|
|
30
|
-
const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({
|
|
40
|
+
const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({
|
|
41
|
+
headerStyle,
|
|
42
|
+
});
|
|
31
43
|
return (
|
|
32
44
|
<Card
|
|
33
45
|
style={defaultHeaderStyle}
|
|
@@ -43,7 +55,9 @@ export default ({
|
|
|
43
55
|
dismissOnPressEnter={false}
|
|
44
56
|
gutter={[20, 0]}
|
|
45
57
|
initialValues={initValues}
|
|
46
|
-
hideLabel={
|
|
58
|
+
hideLabel={
|
|
59
|
+
typeof tableHideLabel === "undefined" ? true : tableHideLabel
|
|
60
|
+
}
|
|
47
61
|
configData={nConfigData}
|
|
48
62
|
form={form}
|
|
49
63
|
colon
|
|
@@ -36,7 +36,10 @@ export default ({
|
|
|
36
36
|
resultTable.table.getSelectedRowData = () => {
|
|
37
37
|
return selectedRowData;
|
|
38
38
|
};
|
|
39
|
-
resultTable.table.getTableSourceData = () => {
|
|
39
|
+
resultTable.table.getTableSourceData = (full) => {
|
|
40
|
+
if (full){
|
|
41
|
+
return dataSource;
|
|
42
|
+
}
|
|
40
43
|
return dataSource?.records;
|
|
41
44
|
};
|
|
42
45
|
return resultTable as HTableInstance;
|
package/src/components/modal.ts
CHANGED
|
@@ -125,7 +125,7 @@ export interface TableInstance {
|
|
|
125
125
|
reloadWithParams: (params?: ParamsModal) => Promise<any>;
|
|
126
126
|
getParams: () => any;
|
|
127
127
|
getSelectedRowData: () => RowObj;
|
|
128
|
-
getTableSourceData: () => any;
|
|
128
|
+
getTableSourceData: (full?:boolean) => any;
|
|
129
129
|
getColSettingKeys: () => ColCheckResultKeys;
|
|
130
130
|
}
|
|
131
131
|
export interface HTableInstance {
|
|
@@ -69,9 +69,9 @@ const linkRender = (config: ConfigItemModal, itemData: any) => {
|
|
|
69
69
|
if (typeof href === "function") {
|
|
70
70
|
hrefUrl = href(itemData);
|
|
71
71
|
}
|
|
72
|
-
const relUrl=hrefUrl||tableVal;
|
|
73
|
-
if (!relUrl){
|
|
74
|
-
return
|
|
72
|
+
const relUrl = hrefUrl || tableVal;
|
|
73
|
+
if (!relUrl) {
|
|
74
|
+
return "-";
|
|
75
75
|
}
|
|
76
76
|
return (
|
|
77
77
|
<Link
|
|
@@ -112,12 +112,14 @@ const Test = () => {
|
|
|
112
112
|
<Button
|
|
113
113
|
onClick={() => {
|
|
114
114
|
dialogTable1.show({
|
|
115
|
-
request:()=>{
|
|
116
|
-
return Promise.resolve({})
|
|
115
|
+
request: () => {
|
|
116
|
+
return Promise.resolve({});
|
|
117
117
|
},
|
|
118
|
-
configData:[
|
|
119
|
-
|
|
120
|
-
|
|
118
|
+
configData: [
|
|
119
|
+
{
|
|
120
|
+
title: "测试",
|
|
121
|
+
},
|
|
122
|
+
],
|
|
121
123
|
});
|
|
122
124
|
}}
|
|
123
125
|
>
|
|
@@ -2,7 +2,8 @@ import {
|
|
|
2
2
|
HTable,
|
|
3
3
|
useHTable,
|
|
4
4
|
HTableConfig,
|
|
5
|
-
HTableHeaderSubBtn,
|
|
5
|
+
HTableHeaderSubBtn,
|
|
6
|
+
HTableHeader,
|
|
6
7
|
} from "@/components";
|
|
7
8
|
import { Button, Card, Tooltip, Typography, Tag, Row } from "antd";
|
|
8
9
|
import { HFormConfigProvider } from "@hw-component/form";
|
|
@@ -158,7 +159,7 @@ export default () => {
|
|
|
158
159
|
return (
|
|
159
160
|
<HFormConfigProvider>
|
|
160
161
|
<div>
|
|
161
|
-
|
|
162
|
+
<HTableHeader configData={[]} />
|
|
162
163
|
<div
|
|
163
164
|
onClick={() => {
|
|
164
165
|
console.log(hTable.table.getTableSourceData());
|