ztxkui 2.8.7 → 2.8.8

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 (4) hide show
  1. package/dist/DemoCom/BasicDemo.js +1 -1
  2. package/dist/components/RangePicker/range-picker.js +27 -15
  3. package/dist/index.js +72 -98
  4. package/package.json +1 -1
package/dist/DemoCom/BasicDemo.js CHANGED
@@ -49,7 +49,7 @@ function BasicDemo() {
49
49
  var _a = useState(10), value = _a[0], setValue = _a[1];
50
50
  var _b = useState([
51
51
  dayjs('2022-05-11'),
52
- dayjs('9999-12-31'),
52
+ dayjs('2022-05-31'),
53
53
  ]), rangeValue = _b[0], setRangeValue = _b[1];
54
54
  return (React.createElement(React.Fragment, null,
55
55
  React.createElement(InputNumber, { value: value, onChange: function (value) {
package/dist/components/RangePicker/range-picker.js CHANGED
@@ -50,6 +50,7 @@ function RangePicker(_a) {
50
50
  var _b = _a.showFar, showFar = _b === void 0 ? false : _b, _c = _a.farChecked, farChecked = _c === void 0 ? false : _c, _d = _a.picker, picker = _d === void 0 ? 'date' : _d, restProps = __rest(_a, ["showFar", "farChecked", "picker"]);
51
51
  var _e = useState(farChecked), checked = _e[0], setChecked = _e[1];
52
52
  var _f = useState(), datePickerValue = _f[0], setDatePickerValue = _f[1];
53
+ var _g = useState(), calendarValue = _g[0], setCalendarValue = _g[1];
53
54
  /**
54
55
  * @description 获取formatString
55
56
  */
@@ -67,6 +68,7 @@ function RangePicker(_a) {
67
68
  var _a, _b;
68
69
  if (Array.isArray(restProps.value)) {
69
70
  setDatePickerValue(restProps.value[0]);
71
+ setCalendarValue(restProps.value);
70
72
  if (showFar &&
71
73
  restProps.value[1] &&
72
74
  ['9999', '9999-12-31', '9999-12'].includes((_b = (_a = restProps.value[1]) === null || _a === void 0 ? void 0 : _a.format) === null || _b === void 0 ? void 0 : _b.call(_a, formatString))) {
@@ -76,21 +78,31 @@ function RangePicker(_a) {
76
78
  }, [restProps.value, formatString, showFar]);
77
79
  /**至今组件切换 */
78
80
  var onFarChangeHandle = function (e) {
79
- // if (
80
- // e.target.checked &&
81
- // Array.isArray(restProps.value) &&
82
- // restProps.value[0]
83
- // ) {
84
- // const firstValue = restProps.value[0];
85
- // restProps.onChange &&
86
- // restProps.onChange(
87
- // [firstValue, dayjs('9999-12-31')],
88
- // [firstValue.format(formatString), '9999-12-31']
89
- // );
90
- // setDatePickerValue(firstValue);
91
- // }
92
- restProps.onChange && restProps.onChange([null, null], ['', '']);
81
+ // 如果选中
82
+ if (e.target.checked) {
83
+ var firstValue = '';
84
+ // 如果选中了第一项
85
+ if (Array.isArray(calendarValue) && calendarValue[0]) {
86
+ firstValue = calendarValue[0];
87
+ }
88
+ else if (Array.isArray(restProps.value) && restProps.value[0]) {
89
+ // 如果初始化时有值
90
+ firstValue = restProps.value[0];
91
+ }
92
+ firstValue &&
93
+ restProps.onChange &&
94
+ restProps.onChange([firstValue, dayjs('9999-12-31')], [firstValue.format(formatString), '9999-12-31']);
95
+ setDatePickerValue(firstValue);
96
+ }
97
+ else {
98
+ restProps.onChange && restProps.onChange([null, null], ['', '']);
99
+ }
93
100
  setChecked(e.target.checked);
101
+ // restProps.onChange && restProps.onChange([null, null], ['', '']);
102
+ // setChecked(e.target.checked);
103
+ };
104
+ var onCalendarChangeHandle = function (dates) {
105
+ setCalendarValue(dates);
94
106
  };
95
107
  /**至今组件 */
96
108
  var renderExtraFooterHandle = function () {
@@ -109,6 +121,6 @@ function RangePicker(_a) {
109
121
  restProps.onChange &&
110
122
  restProps.onChange(value ? [value, dayjs('9999-12-31')] : [null, null], value ? [value.format(formatString), '9999-12-31'] : ['', '']);
111
123
  };
112
- return checked ? (React.createElement(DatePicker, { value: datePickerValue, onChange: onDatePickerChangeHandle, renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, format: noformat.includes(picker) ? undefined : formatHandle })) : (React.createElement(AntRangePicker, __assign({ renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, picker: picker }, restProps)));
124
+ return checked ? (React.createElement(DatePicker, { value: datePickerValue, onChange: onDatePickerChangeHandle, renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, format: noformat.includes(picker) ? undefined : formatHandle })) : (React.createElement(AntRangePicker, __assign({ renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, picker: picker, onCalendarChange: onCalendarChangeHandle }, restProps)));
113
125
  }
114
126
  export default RangePicker;
package/dist/index.js CHANGED
@@ -1,101 +1,75 @@
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
- // import WeChatDemo from './DemoCom/WechatDemo';
16
- // import TableDemo from './DemoCom/TableDemo';
17
- // import TableDemo1 from './DemoCom/TableDemo1';
18
- // import BasicDemo from './DemoCom/BasicDemo';
19
- // import FormDemo from './DemoCom/FormDemo';
20
- // import TableAnalyse from './DemoCom/TableAnalyse';
21
- // import DragSort from './DemoCom/DragSort';
22
- // import PrintDemo from './DemoCom/PrintDemo';
23
- // dayjs.locale(zhCn);
24
- // ReactDOM.render(
25
- // // <React.StrictMode>
26
- // <ConfigProvider locale={zhCN}>
27
- // <BrowserRouter>
28
- // <Switch>
29
- // <Route exact path="/">
30
- // <App />
31
- // </Route>
32
- // <Route exact path="/select">
33
- // <Demo />
34
- // </Route>
35
- // <Route exact path="/tree-select">
36
- // <TreeSelectDemo />
37
- // </Route>
38
- // <Route exact path="/tree">
39
- // <TreeDemo />
40
- // </Route>
41
- // <Route exact path="/upload">
42
- // <UploadDemo />
43
- // </Route>
44
- // <Route exact path="/collapse">
45
- // <CollapseDemo />
46
- // </Route>
47
- // <Route exact path="/timeline">
48
- // <TimelineDemo />
49
- // </Route>
50
- // <Route exact path="/wechat">
51
- // <WeChatDemo />
52
- // </Route>
53
- // <Route exact path="/table">
54
- // <TableDemo />
55
- // </Route>
56
- // <Route exact path="/table1">
57
- // <TableDemo1 />
58
- // </Route>
59
- // <Route exact path="/basic">
60
- // <BasicDemo />
61
- // </Route>
62
- // <Route exact path="/form">
63
- // <FormDemo />
64
- // </Route>
65
- // <Route exact path="/print">
66
- // <PrintDemo />
67
- // </Route>
68
- // <Route exact path="/table-analyse">
69
- // <TableAnalyse />
70
- // </Route>
71
- // <Route exact path="/drag-sort">
72
- // <DragSort />
73
- // </Route>
74
- // <Route exact path="/test">
75
- // <div>
76
- // <h1>
77
- // <Link to="/select">select</Link>
78
- // </h1>
79
- // <h1>
80
- // <Link to="/tree-select">tree select</Link>
81
- // </h1>
82
- // <h1>
83
- // <Link to="/tree">tree</Link>
84
- // </h1>
85
- // <h1>
86
- // <Link to="/upload">upload</Link>
87
- // </h1>
88
- // <h1>
89
- // <Link to="/drag-sort">drag-sort</Link>
90
- // </h1>
91
- // </div>
92
- // </Route>
93
- // </Switch>
94
- // </BrowserRouter>
95
- // </ConfigProvider>,
96
- // // </React.StrictMode>,
97
- // document.getElementById('root')
98
- // );
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
+ import WeChatDemo from './DemoCom/WechatDemo';
16
+ import TableDemo from './DemoCom/TableDemo';
17
+ import TableDemo1 from './DemoCom/TableDemo1';
18
+ import BasicDemo from './DemoCom/BasicDemo';
19
+ import FormDemo from './DemoCom/FormDemo';
20
+ import TableAnalyse from './DemoCom/TableAnalyse';
21
+ import DragSort from './DemoCom/DragSort';
22
+ import PrintDemo from './DemoCom/PrintDemo';
23
+ dayjs.locale(zhCn);
24
+ ReactDOM.render(
25
+ // <React.StrictMode>
26
+ React.createElement(ConfigProvider, { locale: zhCN },
27
+ React.createElement(BrowserRouter, null,
28
+ React.createElement(Switch, null,
29
+ React.createElement(Route, { exact: true, path: "/" },
30
+ React.createElement(App, null)),
31
+ React.createElement(Route, { exact: true, path: "/select" },
32
+ React.createElement(Demo, null)),
33
+ React.createElement(Route, { exact: true, path: "/tree-select" },
34
+ React.createElement(TreeSelectDemo, null)),
35
+ React.createElement(Route, { exact: true, path: "/tree" },
36
+ React.createElement(TreeDemo, null)),
37
+ React.createElement(Route, { exact: true, path: "/upload" },
38
+ React.createElement(UploadDemo, null)),
39
+ React.createElement(Route, { exact: true, path: "/collapse" },
40
+ React.createElement(CollapseDemo, null)),
41
+ React.createElement(Route, { exact: true, path: "/timeline" },
42
+ React.createElement(TimelineDemo, null)),
43
+ React.createElement(Route, { exact: true, path: "/wechat" },
44
+ React.createElement(WeChatDemo, null)),
45
+ React.createElement(Route, { exact: true, path: "/table" },
46
+ React.createElement(TableDemo, null)),
47
+ React.createElement(Route, { exact: true, path: "/table1" },
48
+ React.createElement(TableDemo1, null)),
49
+ React.createElement(Route, { exact: true, path: "/basic" },
50
+ React.createElement(BasicDemo, null)),
51
+ React.createElement(Route, { exact: true, path: "/form" },
52
+ React.createElement(FormDemo, null)),
53
+ React.createElement(Route, { exact: true, path: "/print" },
54
+ React.createElement(PrintDemo, null)),
55
+ React.createElement(Route, { exact: true, path: "/table-analyse" },
56
+ React.createElement(TableAnalyse, null)),
57
+ React.createElement(Route, { exact: true, path: "/drag-sort" },
58
+ React.createElement(DragSort, null)),
59
+ React.createElement(Route, { exact: true, path: "/test" },
60
+ React.createElement("div", null,
61
+ React.createElement("h1", null,
62
+ React.createElement(Link, { to: "/select" }, "select")),
63
+ React.createElement("h1", null,
64
+ React.createElement(Link, { to: "/tree-select" }, "tree select")),
65
+ React.createElement("h1", null,
66
+ React.createElement(Link, { to: "/tree" }, "tree")),
67
+ React.createElement("h1", null,
68
+ React.createElement(Link, { to: "/upload" }, "upload")),
69
+ React.createElement("h1", null,
70
+ React.createElement(Link, { to: "/drag-sort" }, "drag-sort"))))))),
71
+ // </React.StrictMode>,
72
+ document.getElementById('root'));
99
73
  export { default as Button } from './components/Button';
100
74
  export { default as Calendar } from './components/Calendar';
101
75
  export { default as Checkbox } from './components/Checkbox';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "2.8.7",
3
+ "version": "2.8.8",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",