ztxkui 3.7.5 → 3.7.7
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/dist/DemoCom/FormDemo.js +11 -6
- package/dist/components/Table/utils/getSummaryData.js +0 -1
- package/dist/components/business/SearchContainer/hooks/useToggle.d.ts +1 -0
- package/dist/components/business/SearchContainer/hooks/useToggle.js +20 -5
- package/dist/components/business/SearchContainer/search-left.d.ts +3 -0
- package/dist/components/business/SearchContainer/search-left.js +6 -3
- package/dist/index.css +1 -1
- package/package.json +1 -1
package/dist/DemoCom/FormDemo.js
CHANGED
|
@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
import React, { useState, useMemo } from 'react';
|
|
12
|
+
import React, { useState, useMemo, useRef } from 'react';
|
|
13
13
|
import SearchContainer from '../components/business/SearchContainer';
|
|
14
14
|
import Form from '../components/Form';
|
|
15
15
|
import Input from '../components/Input';
|
|
@@ -18,7 +18,7 @@ import DatePicker from '../components/DatePicker';
|
|
|
18
18
|
import Checkbox from '../components/Checkbox';
|
|
19
19
|
import Radio from '../components/Radio';
|
|
20
20
|
import InputNumber from '../components/InputNumber';
|
|
21
|
-
var SearchItem = SearchContainer.SearchItem, SearchLeft = SearchContainer.SearchLeft;
|
|
21
|
+
var SearchItem = SearchContainer.SearchItem, SearchLeft = SearchContainer.SearchLeft, SearchRight = SearchContainer.SearchRight;
|
|
22
22
|
var RangePicker = DatePicker.RangePicker;
|
|
23
23
|
var configInfo = {
|
|
24
24
|
pwNoCopy: {
|
|
@@ -56,10 +56,11 @@ var FormDemo = function () {
|
|
|
56
56
|
var configInfoMemo = useMemo(function () {
|
|
57
57
|
return __assign(__assign({}, configInfo), { startTime: __assign(__assign({}, configInfo === null || configInfo === void 0 ? void 0 : configInfo.startTime), { isDisplay: status === '1' ? true : false }) });
|
|
58
58
|
}, [status]);
|
|
59
|
+
var handleRef = useRef(null);
|
|
59
60
|
return (React.createElement(React.Fragment, null,
|
|
60
61
|
React.createElement(Form, { name: "test-list", form: form },
|
|
61
62
|
React.createElement(SearchContainer, { dark: true },
|
|
62
|
-
React.createElement(SearchLeft, { configInfo: configInfoMemo, isDynamic: true, dynamicStorageKey: "symbol-key-00001" },
|
|
63
|
+
React.createElement(SearchLeft, { configInfo: configInfoMemo, isDynamic: true, dynamicStorageKey: "symbol-key-00001", isToggle: true, handleRef: handleRef },
|
|
63
64
|
React.createElement(SearchItem, { width: "half", name: "pwNo", configname: "pwNoCopy", label: "\u5165\u5E93\u5355\u53F7", rules: [
|
|
64
65
|
{
|
|
65
66
|
required: true,
|
|
@@ -76,10 +77,10 @@ var FormDemo = function () {
|
|
|
76
77
|
},
|
|
77
78
|
] },
|
|
78
79
|
React.createElement(Input, null)),
|
|
79
|
-
React.createElement(SearchItem, { width: "half", name: "status", label: "\u5355\u636E\u72B6\u6001"
|
|
80
|
+
React.createElement(SearchItem, { width: "half", name: "status", label: "\u5355\u636E\u72B6\u6001" },
|
|
80
81
|
React.createElement(Select, { onChange: function (value) {
|
|
81
82
|
setStatus(value);
|
|
82
|
-
}
|
|
83
|
+
} },
|
|
83
84
|
React.createElement(Select.Option, { value: "1" }, "\u662F"),
|
|
84
85
|
React.createElement(Select.Option, { value: "0" }, "\u5426"))),
|
|
85
86
|
React.createElement(SearchItem, { name: "intime", configname: "startTime", label: "\u5165\u5E93\u65E5\u671F" },
|
|
@@ -125,6 +126,10 @@ var FormDemo = function () {
|
|
|
125
126
|
React.createElement(SearchItem, { name: "type8", width: "half", label: "\u4F60\u597D811" },
|
|
126
127
|
React.createElement(Select, null)),
|
|
127
128
|
React.createElement(SearchItem, { name: "type5", width: "all", label: "\u4F60\u597D" },
|
|
128
|
-
React.createElement(Input.TextArea, { showCount: true, maxLength: 5000, autoSize: { minRows: 3, maxRows: 5 } })))
|
|
129
|
+
React.createElement(Input.TextArea, { showCount: true, maxLength: 5000, autoSize: { minRows: 3, maxRows: 5 } }))),
|
|
130
|
+
React.createElement(SearchRight, { onSearchHandle: function () {
|
|
131
|
+
var _a;
|
|
132
|
+
(_a = handleRef.current) === null || _a === void 0 ? void 0 : _a.setToggleHandle(false);
|
|
133
|
+
}, onResetHandle: function () { } })))));
|
|
129
134
|
};
|
|
130
135
|
export default FormDemo;
|
|
@@ -14,7 +14,6 @@ import { plus, round } from 'number-precision';
|
|
|
14
14
|
*/
|
|
15
15
|
function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
|
|
16
16
|
if (hasRowSelection === void 0) { hasRowSelection = false; }
|
|
17
|
-
console.log(columns);
|
|
18
17
|
var _summaryData = [];
|
|
19
18
|
if (Array.isArray(summaryConfig)) {
|
|
20
19
|
summaryConfig.forEach(function (summary) {
|
|
@@ -2,19 +2,20 @@
|
|
|
2
2
|
* @author 陈亚雄
|
|
3
3
|
* @description 设置自动展开收起
|
|
4
4
|
*/
|
|
5
|
-
import { useEffect, useState, useCallback } from 'react';
|
|
5
|
+
import { useEffect, useState, useCallback, useRef } from 'react';
|
|
6
6
|
export default function useToggle(domRef, dynamicList, isToggle) {
|
|
7
7
|
var _a = useState(false), toggle = _a[0], setToggle = _a[1];
|
|
8
|
+
var isHandle = useRef(false);
|
|
8
9
|
useEffect(function () {
|
|
9
10
|
if (domRef.current &&
|
|
10
11
|
Array.isArray(dynamicList) &&
|
|
11
12
|
dynamicList.length &&
|
|
12
|
-
isToggle
|
|
13
|
+
isToggle &&
|
|
14
|
+
!isHandle.current) {
|
|
13
15
|
var height = domRef.current.offsetHeight;
|
|
14
|
-
console.log(height);
|
|
15
16
|
if (height >= 84) {
|
|
16
|
-
domRef.current.style.cssText = 'max-height: 84px;';
|
|
17
17
|
setToggle(false);
|
|
18
|
+
domRef.current.style.cssText = 'max-height: 84px;';
|
|
18
19
|
}
|
|
19
20
|
else {
|
|
20
21
|
setToggle(true);
|
|
@@ -26,6 +27,7 @@ export default function useToggle(domRef, dynamicList, isToggle) {
|
|
|
26
27
|
if (!domRef.current) {
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
30
|
+
isHandle.current = true;
|
|
29
31
|
if (toggle) {
|
|
30
32
|
setToggle(false);
|
|
31
33
|
domRef.current.style.cssText = 'max-height: 84px;';
|
|
@@ -35,5 +37,18 @@ export default function useToggle(domRef, dynamicList, isToggle) {
|
|
|
35
37
|
domRef.current.style.cssText = 'max-height: 800px;';
|
|
36
38
|
}
|
|
37
39
|
}, [toggle, domRef]);
|
|
38
|
-
|
|
40
|
+
var setToggleHandle = useCallback(function (toggle) {
|
|
41
|
+
if (!domRef.current) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
isHandle.current = true;
|
|
45
|
+
if (toggle) {
|
|
46
|
+
domRef.current.style.cssText = 'max-height: 800px;';
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
domRef.current.style.cssText = 'max-height: 84px;';
|
|
50
|
+
}
|
|
51
|
+
setToggle(toggle);
|
|
52
|
+
}, [domRef]);
|
|
53
|
+
return { toggle: toggle, setToggle: setToggle, onToggleChange: onToggleChange, setToggleHandle: setToggleHandle };
|
|
39
54
|
}
|
|
@@ -16,6 +16,9 @@ export interface ISearchLeft {
|
|
|
16
16
|
className?: string;
|
|
17
17
|
configInfo?: any;
|
|
18
18
|
isToggle?: boolean;
|
|
19
|
+
handleRef?: React.MutableRefObject<{
|
|
20
|
+
setToggleHandle: (toggle: boolean) => void;
|
|
21
|
+
} | null>;
|
|
19
22
|
}
|
|
20
23
|
declare const SearchLeft: React.FC<ISearchLeft>;
|
|
21
24
|
export default SearchLeft;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useCallback, useEffect, useState, useRef } from 'react';
|
|
1
|
+
import React, { useCallback, useEffect, useState, useRef, useImperativeHandle, } from 'react';
|
|
2
2
|
import classNames from 'classnames';
|
|
3
3
|
import SearchDrawer from './search-drawer';
|
|
4
4
|
import { SettingOutlined, DownOutlined } from '@ant-design/icons';
|
|
@@ -14,7 +14,7 @@ function useConfigChildren(children) {
|
|
|
14
14
|
return { configChildren: configChildren };
|
|
15
15
|
}
|
|
16
16
|
var SearchLeft = function (_a) {
|
|
17
|
-
var children = _a.children, className = _a.className, isDynamic = _a.isDynamic, _dynamicStorageKey = _a.dynamicStorageKey, onChange = _a.onChange, _b = _a.isFlex, isFlex = _b === void 0 ? true : _b, configInfo = _a.configInfo, isToggle = _a.isToggle;
|
|
17
|
+
var children = _a.children, className = _a.className, isDynamic = _a.isDynamic, _dynamicStorageKey = _a.dynamicStorageKey, onChange = _a.onChange, _b = _a.isFlex, isFlex = _b === void 0 ? true : _b, configInfo = _a.configInfo, isToggle = _a.isToggle, handleRef = _a.handleRef;
|
|
18
18
|
// 为了兼容之前的写法,默认取当前路由地址,但是这种情况会导致微前端下面出现一些问题
|
|
19
19
|
// 所以在使用组件的时候,如果要使用动态配置,必须传入dynamicStorageKey
|
|
20
20
|
// 如果有时间还是需要传入storageKey,之前的写法需要简化
|
|
@@ -37,7 +37,10 @@ var SearchLeft = function (_a) {
|
|
|
37
37
|
}, [dynamicArr]);
|
|
38
38
|
/** 表单容器Ref */
|
|
39
39
|
var containerRef = useRef(null);
|
|
40
|
-
var _f = useToggle(containerRef, dynamicList, isToggle), toggle = _f.toggle, onToggleChange = _f.onToggleChange;
|
|
40
|
+
var _f = useToggle(containerRef, dynamicList, isToggle), toggle = _f.toggle, onToggleChange = _f.onToggleChange, setToggleHandle = _f.setToggleHandle;
|
|
41
|
+
useImperativeHandle(handleRef, function () { return ({
|
|
42
|
+
setToggleHandle: setToggleHandle,
|
|
43
|
+
}); });
|
|
41
44
|
/**内部改变表单位置等信息 */
|
|
42
45
|
var onInsideChange = useCallback(function (newList) {
|
|
43
46
|
setDynamicList(newList);
|
package/dist/index.css
CHANGED