ztxkui 1.7.2 → 1.7.6

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.
Files changed (9) hide show
  1. package/dist/Demo.js +9 -2
  2. package/dist/TreeSelectDemo.js +1 -1
  3. package/dist/components/EnhanceSelect/index.d.ts +9 -1
  4. package/dist/components/EnhanceSelect/index.js +18 -4
  5. package/dist/components/EnhanceTree/index.d.ts +4 -0
  6. package/dist/components/EnhanceTreeSelect/index.d.ts +4 -0
  7. package/dist/components/ZtIcon/index.d.ts +1 -1
  8. package/dist/index.js +46 -63
  9. package/package.json +2 -2
package/dist/Demo.js CHANGED
@@ -23,14 +23,21 @@ function Demo() {
23
23
  {
24
24
  id: '1',
25
25
  name: '你好',
26
+ test1: 'JS',
26
27
  },
27
28
  {
28
29
  id: '2',
29
30
  name: '张三',
31
+ test1: 'Node',
30
32
  },
31
33
  {
32
34
  id: '3',
33
35
  name: '李四',
36
+ test1: 'Webpack',
37
+ },
38
+ {
39
+ id: '4',
40
+ name: '王五',
34
41
  },
35
42
  ]);
36
43
  setDefaultList([
@@ -50,12 +57,12 @@ function Demo() {
50
57
  React.createElement(Link, { to: "/test" }, "test"),
51
58
  React.createElement("h1", null, "\u4F5C\u4E3A\u6F14\u793A\u4F7F\u7528"),
52
59
  React.createElement("h2", null, "\u5982\u679C\u6570\u636E\u662F\u901A\u8FC7\u5916\u90E8\u83B7\u53D6\u7684\uFF0C\u53EF\u4EE5\u901A\u8FC7\u4F20\u9012list\u5C5E\u6027"),
53
- React.createElement(EnhanceSelect, { style: selectStyle, list: list, showAll: true }),
60
+ React.createElement(EnhanceSelect, { style: selectStyle, list: list, showAll: true, joinKey: "test1" }),
54
61
  React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
55
62
  React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
56
63
  status: 50,
57
64
  companyId: '1397074605412696066',
58
- }), request: request }),
65
+ }), request: request, joinKey: "depName" }),
59
66
  React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
60
67
  React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
61
68
  status: 50,
package/dist/TreeSelectDemo.js CHANGED
@@ -63,7 +63,7 @@ function TreeSelectDemo() {
63
63
  React.createElement(Link, { to: "/test" }, "test"),
64
64
  React.createElement("h1", null, "\u4F5C\u4E3A\u6F14\u793A\u4F7F\u7528"),
65
65
  React.createElement("h2", null, "\u5982\u679C\u6570\u636E\u662F\u901A\u8FC7\u5916\u90E8\u83B7\u53D6\u7684\uFF0C\u53EF\u4EE5\u901A\u8FC7\u4F20\u9012list\u5C5E\u6027"),
66
- React.createElement(EnhanceTreeSelect, { style: selectStyle, treeData: treeData }),
66
+ React.createElement(EnhanceTreeSelect, { style: selectStyle, treeData: treeData, treeNodeLabelProp: "key" }),
67
67
  React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u4E00\u6B21\u6027\u83B7\u53D6\u6570\u636E"),
68
68
  React.createElement(EnhanceTreeSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-system/dept/lazy-tree", params: JSON.stringify({
69
69
  status: 50,
package/dist/components/EnhanceSelect/index.d.ts CHANGED
@@ -37,6 +37,14 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
37
37
  * 下拉框显示值对应的KEY
38
38
  */
39
39
  titleKey?: string;
40
+ /**
41
+ * 拼接字段对应的key
42
+ */
43
+ joinKey?: string | string[];
44
+ /**
45
+ * 拼接形式
46
+ */
47
+ joinStr?: string;
40
48
  /**
41
49
  * 是否显示全部，全部的value为空字符串
42
50
  */
@@ -87,6 +95,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
87
95
  * { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
88
96
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
89
97
  */
90
- declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, transformData, ...restProps }: IProps<VT>): JSX.Element;
98
+ declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
91
99
  declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
92
100
  export default _default;
package/dist/components/EnhanceSelect/index.js CHANGED
@@ -71,9 +71,9 @@ function getData(request, options) {
71
71
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
72
72
  */
73
73
  function EnhanceSelect(_a) {
74
- var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, transformData = _a.transformData, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "transformData"]);
74
+ var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, transformData = _a.transformData, joinKey = _a.joinKey, _e = _a.joinStr, joinStr = _e === void 0 ? '-' : _e, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "transformData", "joinKey", "joinStr"]);
75
75
  // 下拉数据源
76
- var _e = useFetchState([]), selectList = _e[0], setSelectList = _e[1];
76
+ var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
77
77
  // 如果selectList 发生改变，那么触发onCompleted事件
78
78
  useEffect(function () {
79
79
  if (Array.isArray(selectList) && onCompleted) {
@@ -220,7 +220,21 @@ function EnhanceSelect(_a) {
220
220
  var key = componentKey ? item[componentKey] : item[dataKey];
221
221
  var value = item[dataKey];
222
222
  var title = item[titleKey];
223
- return (React.createElement(Select.Option, { key: key, value: value, title: title }, title));
223
+ var joinTitle = [];
224
+ if (joinKey) {
225
+ joinTitle = Array.isArray(joinKey)
226
+ ? joinKey.map(function (joinItem) { return item[joinItem]; })
227
+ : item[joinKey]
228
+ ? [item[joinKey]]
229
+ : [];
230
+ }
231
+ if (Array.isArray(joinTitle)) {
232
+ joinTitle.unshift(title);
233
+ }
234
+ else {
235
+ joinTitle = [title];
236
+ }
237
+ return (React.createElement(Select.Option, { key: key, value: value, title: title }, Array.isArray(joinTitle) ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr) : ''));
224
238
  })));
225
239
  }
226
240
  // 本地搜索
@@ -248,6 +262,6 @@ function EnhanceSelect(_a) {
248
262
  onChange && onChange(value, option);
249
263
  }
250
264
  };
251
- return (React.createElement(Select, __assign({ allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle }, restProps), renderSelectOption()));
265
+ return (React.createElement(Select, __assign({ allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : undefined, onChange: onChangeHandle, optionLabelProp: "title" }, restProps), renderSelectOption()));
252
266
  }
253
267
  export default memo(EnhanceSelect);
package/dist/components/EnhanceTree/index.d.ts CHANGED
@@ -46,6 +46,10 @@ export interface IProps extends TreeProps {
46
46
  * 数据加载完毕触发
47
47
  */
48
48
  onCompleted?: (data: any) => void;
49
+ /**
50
+ * 数据发生改变时触发
51
+ */
52
+ onChange?: (value: string, option: string, completeData?: any) => void;
49
53
  }
50
54
  /**
51
55
  * 增强树组件
package/dist/components/EnhanceTreeSelect/index.d.ts CHANGED
@@ -38,6 +38,10 @@ export interface IProps<T> extends Omit<TreeSelectProps<T>, 'onChange'> {
38
38
  * 数据加载完毕触发
39
39
  */
40
40
  onCompleted?: (data: any) => void;
41
+ /**
42
+ * 数据发生改变时触发
43
+ */
44
+ onChange?: any;
41
45
  }
42
46
  /**
43
47
  * 增强下拉树
package/dist/components/ZtIcon/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  /// <reference types="react" />
2
- declare const IconFont: import("react").FC<import("@ant-design/icons/lib/components/IconFont").IconFontProps<string>>;
2
+ declare const IconFont: import("react").SFC<import("@ant-design/icons/lib/components/IconFont").IconFontProps>;
3
3
  export default IconFont;
package/dist/index.js CHANGED
@@ -1,66 +1,49 @@
1
- // import React from 'react';
2
- // import ReactDOM from 'react-dom';
3
- // import App from './App';
4
- // import { ConfigProvider } from 'antd';
5
- // import zhCN from 'antd/lib/locale/zh_CN';
6
- // import * as dayjs from 'dayjs';
7
- // import zhCn from 'dayjs/locale/zh-cn';
8
- // import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
9
- // import Demo from './Demo';
10
- // import TreeSelectDemo from './TreeSelectDemo';
11
- // import TreeDemo from './TreeDemo';
12
- // import UploadDemo from './UploadDemo';
13
- // import CollapseDemo from './DemoCom/CollapseDemo';
14
- // import TimelineDemo from './DemoCom/TimelineDemo';
15
- // dayjs.locale(zhCn);
16
- // ReactDOM.render(
17
- // // <React.StrictMode>
18
- // <ConfigProvider locale={zhCN}>
19
- // <BrowserRouter>
20
- // <Switch>
21
- // <Route exact path="/">
22
- // <App />
23
- // </Route>
24
- // <Route exact path="/select">
25
- // <Demo />
26
- // </Route>
27
- // <Route exact path="/tree-select">
28
- // <TreeSelectDemo />
29
- // </Route>
30
- // <Route exact path="/tree">
31
- // <TreeDemo />
32
- // </Route>
33
- // <Route exact path="/upload">
34
- // <UploadDemo />
35
- // </Route>
36
- // <Route exact path="/collapse">
37
- // <CollapseDemo />
38
- // </Route>
39
- // <Route exact path="/timeline">
40
- // <TimelineDemo />
41
- // </Route>
42
- // <Route exact path="/test">
43
- // <div>
44
- // <h1>
45
- // <Link to="/select">select</Link>
46
- // </h1>
47
- // <h1>
48
- // <Link to="/tree-select">tree select</Link>
49
- // </h1>
50
- // <h1>
51
- // <Link to="/tree">tree</Link>
52
- // </h1>
53
- // <h1>
54
- // <Link to="/upload">upload</Link>
55
- // </h1>
56
- // </div>
57
- // </Route>
58
- // </Switch>
59
- // </BrowserRouter>
60
- // </ConfigProvider>,
61
- // // </React.StrictMode>,
62
- // document.getElementById('root')
63
- // );
1
+ import React from 'react';
2
+ import ReactDOM from 'react-dom';
3
+ import App from './App';
4
+ import { ConfigProvider } from 'antd';
5
+ import zhCN from 'antd/lib/locale/zh_CN';
6
+ import * as dayjs from 'dayjs';
7
+ import zhCn from 'dayjs/locale/zh-cn';
8
+ import { BrowserRouter, Switch, Route, Link } from 'react-router-dom';
9
+ import Demo from './Demo';
10
+ import TreeSelectDemo from './TreeSelectDemo';
11
+ import TreeDemo from './TreeDemo';
12
+ import UploadDemo from './UploadDemo';
13
+ import CollapseDemo from './DemoCom/CollapseDemo';
14
+ import TimelineDemo from './DemoCom/TimelineDemo';
15
+ dayjs.locale(zhCn);
16
+ ReactDOM.render(
17
+ // <React.StrictMode>
18
+ React.createElement(ConfigProvider, { locale: zhCN },
19
+ React.createElement(BrowserRouter, null,
20
+ React.createElement(Switch, null,
21
+ React.createElement(Route, { exact: true, path: "/" },
22
+ React.createElement(App, null)),
23
+ React.createElement(Route, { exact: true, path: "/select" },
24
+ React.createElement(Demo, null)),
25
+ React.createElement(Route, { exact: true, path: "/tree-select" },
26
+ React.createElement(TreeSelectDemo, null)),
27
+ React.createElement(Route, { exact: true, path: "/tree" },
28
+ React.createElement(TreeDemo, null)),
29
+ React.createElement(Route, { exact: true, path: "/upload" },
30
+ React.createElement(UploadDemo, null)),
31
+ React.createElement(Route, { exact: true, path: "/collapse" },
32
+ React.createElement(CollapseDemo, null)),
33
+ React.createElement(Route, { exact: true, path: "/timeline" },
34
+ React.createElement(TimelineDemo, null)),
35
+ React.createElement(Route, { exact: true, path: "/test" },
36
+ React.createElement("div", null,
37
+ React.createElement("h1", null,
38
+ React.createElement(Link, { to: "/select" }, "select")),
39
+ React.createElement("h1", null,
40
+ React.createElement(Link, { to: "/tree-select" }, "tree select")),
41
+ React.createElement("h1", null,
42
+ React.createElement(Link, { to: "/tree" }, "tree")),
43
+ React.createElement("h1", null,
44
+ React.createElement(Link, { to: "/upload" }, "upload"))))))),
45
+ // </React.StrictMode>,
46
+ document.getElementById('root'));
64
47
  export { default as Button } from './components/Button';
65
48
  export { default as Calendar } from './components/Calendar';
66
49
  export { default as Checkbox } from './components/Checkbox';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "1.7.2",
3
+ "version": "1.7.6",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",
@@ -12,7 +12,7 @@
12
12
  "dist"
13
13
  ],
14
14
  "dependencies": {
15
- "antd": "^4.16.13",
15
+ "antd": "^4.16.8",
16
16
  "axios": "^0.21.1",
17
17
  "classnames": "^2.2.6",
18
18
  "dayjs": "^1.10.4",