ztxkui 2.3.6 → 2.3.9

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 (7) hide show
  1. package/dist/DemoCom/TableDemo.js +11 -1
  2. package/dist/components/Table/table-enhance-cell.d.ts +2 -2
  3. package/dist/components/Table/table-enhance-cell.js +44 -11
  4. package/dist/components/Upload/upload-table.js +16 -18
  5. package/dist/components/Upload/upload.js +1 -1
  6. package/dist/index.js +79 -58
  7. package/package.json +1 -1
package/dist/DemoCom/TableDemo.js CHANGED
@@ -195,7 +195,17 @@ var TableDemo = function () {
195
195
  },
196
196
  editableConfig: {
197
197
  type: 'inputNumber',
198
- min: 0,
198
+ // min: 0,
199
+ minHandle: function (record) {
200
+ return {
201
+ number: 0,
202
+ };
203
+ },
204
+ maxHandle: function (record) {
205
+ return {
206
+ number: 10,
207
+ };
208
+ },
199
209
  precision: 3,
200
210
  },
201
211
  },
package/dist/components/Table/table-enhance-cell.d.ts CHANGED
@@ -8,8 +8,8 @@ export interface IEditableConfig {
8
8
  key: string;
9
9
  label: string;
10
10
  };
11
- maxHandle?: (record: any) => number;
12
- minHandle?: (record: any) => number;
11
+ maxHandle?: (record: any) => any;
12
+ minHandle?: (record: any) => any;
13
13
  /**是否禁用 */
14
14
  disabledHandle?: (record: any) => boolean;
15
15
  /**数字输入框的转换类型：内置 货币和百分比 */
package/dist/components/Table/table-enhance-cell.js CHANGED
@@ -58,7 +58,7 @@ var __rest = (this && this.__rest) || function (s, e) {
58
58
  };
59
59
  import React, { useContext, useEffect, memo } from 'react';
60
60
  import { EditableContext } from './table-enhance-row';
61
- import { Form, Input, InputNumber, Select } from '../../index';
61
+ import { Form, Input, InputNumber, Select, message } from '../../index';
62
62
  var TableEnhanceCell = memo(function (_a) {
63
63
  var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave"]);
64
64
  var form = useContext(EditableContext);
@@ -71,22 +71,41 @@ var TableEnhanceCell = memo(function (_a) {
71
71
  /**
72
72
  * @description 保存事件
73
73
  */
74
- var save = function () { return __awaiter(void 0, void 0, void 0, function () {
75
- var values, err_1;
76
- return __generator(this, function (_a) {
77
- switch (_a.label) {
74
+ var save = function (info) { return __awaiter(void 0, void 0, void 0, function () {
75
+ var values, result, currentInputNumberValue, result, currentInputNumberValue, err_1;
76
+ var _a, _b;
77
+ return __generator(this, function (_c) {
78
+ switch (_c.label) {
78
79
  case 0:
79
- _a.trys.push([0, 2, , 3]);
80
+ _c.trys.push([0, 2, , 3]);
80
81
  return [4 /*yield*/, (form === null || form === void 0 ? void 0 : form.validateFields())];
81
82
  case 1:
82
- values = _a.sent();
83
+ values = _c.sent();
83
84
  if (!handleSave) {
84
85
  console.error('Table props onEditableSave is not a function');
85
86
  }
87
+ if (info && info.maxResult) {
88
+ result = info.maxResult;
89
+ currentInputNumberValue = values[dataIndex];
90
+ if (currentInputNumberValue > (result === null || result === void 0 ? void 0 : result.number)) {
91
+ message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (typeof index === 'number' ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u8D85\u8FC7\u6700\u5927\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5927\u503C!");
92
+ handleSave(__assign(__assign(__assign({}, record), values), (_a = {}, _a[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _a)), index, dataIndex);
93
+ return [2 /*return*/];
94
+ }
95
+ }
96
+ if (info && info.minResult) {
97
+ result = info.minResult;
98
+ currentInputNumberValue = values[dataIndex];
99
+ if (currentInputNumberValue < (result === null || result === void 0 ? void 0 : result.number)) {
100
+ message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (index ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5C0F\u503C!");
101
+ handleSave(__assign(__assign(__assign({}, record), values), (_b = {}, _b[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _b)), index, dataIndex);
102
+ return [2 /*return*/];
103
+ }
104
+ }
86
105
  handleSave(__assign(__assign({}, record), values), index, dataIndex);
87
106
  return [3 /*break*/, 3];
88
107
  case 2:
89
- err_1 = _a.sent();
108
+ err_1 = _c.sent();
90
109
  console.error('Save failed:', err_1);
91
110
  return [3 /*break*/, 3];
92
111
  case 3: return [2 /*return*/];
@@ -113,15 +132,29 @@ var TableEnhanceCell = memo(function (_a) {
113
132
  label: 'dictValue',
114
133
  };
115
134
  var inputNumMaxMin = {}; // 数字input框最大最小值
135
+ var maxResult = {};
136
+ var minResult = {};
116
137
  var disabledResult = editableProps === null || editableProps === void 0 ? void 0 : editableProps.disabled;
117
138
  if (data && data instanceof Function) {
118
139
  selectData = data();
119
140
  }
120
141
  if (maxHandle && maxHandle instanceof Function) {
121
- inputNumMaxMin.max = maxHandle(record);
142
+ var result = maxHandle(record);
143
+ if (typeof result === 'number') {
144
+ inputNumMaxMin.max = result;
145
+ }
146
+ else {
147
+ maxResult = result;
148
+ }
122
149
  }
123
150
  if (minHandle && minHandle instanceof Function) {
124
- inputNumMaxMin.min = minHandle(record);
151
+ var result = minHandle(record);
152
+ if (typeof result === 'number') {
153
+ inputNumMaxMin.min = result;
154
+ }
155
+ else {
156
+ minResult = result;
157
+ }
125
158
  }
126
159
  if (disabledHandle && disabledHandle instanceof Function) {
127
160
  disabledResult = disabledHandle(record);
@@ -134,7 +167,7 @@ var TableEnhanceCell = memo(function (_a) {
134
167
  }
135
168
  else if (type === 'inputNumber') {
136
169
  return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
137
- React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save }))));
170
+ React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, { disabled: disabledResult, onPressEnter: function () { return save({ maxResult: maxResult, minResult: minResult }); }, onBlur: function () { return save({ maxResult: maxResult, minResult: minResult }); } }))));
138
171
  }
139
172
  else if (type === 'textArea') {
140
173
  return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
package/dist/components/Upload/upload-table.js CHANGED
@@ -45,6 +45,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
45
45
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
46
46
  }
47
47
  };
48
+ var __rest = (this && this.__rest) || function (s, e) {
49
+ var t = {};
50
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
51
+ t[p] = s[p];
52
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
53
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
54
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
55
+ t[p[i]] = s[p[i]];
56
+ }
57
+ return t;
58
+ };
48
59
  var __spreadArray = (this && this.__spreadArray) || function (to, from) {
49
60
  for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
50
61
  to[j] = from[i];
@@ -361,7 +372,7 @@ var UploadTable = function (_a) {
361
372
  if (Array.isArray(fileList)) {
362
373
  var newDataSource = fileList.map(function (file, index) {
363
374
  var _a, _b, _c, _d, _e, _f, _g, _h;
364
- var name = file.name, fileName = file.fileName, percent = file.percent, size = file.size, fileSize = file.fileSize, status = file.status, response = file.response, originFileObj = file.originFileObj, updateTime = file.updateTime, createUserName = file.createUserName;
375
+ var name = file.name, fileName = file.fileName, percent = file.percent, size = file.size, fileSize = file.fileSize, status = file.status, response = file.response, originFileObj = file.originFileObj, updateTime = file.updateTime, createUserName = file.createUserName, restItem = __rest(file, ["name", "fileName", "percent", "size", "fileSize", "status", "response", "originFileObj", "updateTime", "createUserName"]);
365
376
  // if (response && response.data && !response.data?.createTime) {
366
377
  // response.data.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
367
378
  // }
@@ -375,30 +386,17 @@ var UploadTable = function (_a) {
375
386
  if (+newPercent === 100 && status !== 'done') {
376
387
  newPercent = 99;
377
388
  }
378
- return {
379
- id: index,
380
- status: status,
381
- percent: newPercent,
382
- fileName: name || fileName,
383
- fileSize: size || fileSize || 0,
384
- response: response,
385
- uploadTime: response && ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.createTime)
389
+ return __assign({ id: index, status: status, percent: newPercent, fileName: name || fileName, fileSize: size || fileSize || 0, response: response, uploadTime: response && ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.createTime)
386
390
  ? dayjs((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.createTime).format('YYYY-MM-DD HH:mm:ss')
387
391
  : updateTime
388
392
  ? dayjs(updateTime).format('YYYY-MM-DD HH:mm:ss')
389
- : dayjs((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.createTime).format('YYYY-MM-DD HH:mm:ss'),
390
- uploadUser: response && ((_d = response.data) === null || _d === void 0 ? void 0 : _d.createUserName)
393
+ : dayjs((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.createTime).format('YYYY-MM-DD HH:mm:ss'), uploadUser: response && ((_d = response.data) === null || _d === void 0 ? void 0 : _d.createUserName)
391
394
  ? response.data.createUserName
392
395
  : createUserName
393
396
  ? createUserName
394
- : uploadUser,
395
- fileId: response ? (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.attachId : null,
396
- fileUrl: response ? (_f = response === null || response === void 0 ? void 0 : response.data) === null || _f === void 0 ? void 0 : _f.link : null,
397
- originFileObj: originFileObj,
398
- serverFileName: response
397
+ : uploadUser, fileId: response ? (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.attachId : null, fileUrl: response ? (_f = response === null || response === void 0 ? void 0 : response.data) === null || _f === void 0 ? void 0 : _f.link : null, originFileObj: originFileObj, serverFileName: response
399
398
  ? ((_g = response.data) === null || _g === void 0 ? void 0 : _g.name) || ((_h = response.data) === null || _h === void 0 ? void 0 : _h.originalName)
400
- : null,
401
- };
399
+ : null }, restItem);
402
400
  });
403
401
  setDataSource(newDataSource);
404
402
  }
package/dist/components/Upload/upload.js CHANGED
@@ -139,7 +139,7 @@ var Upload = function (props) {
139
139
  }, [maxSize, maxSizeStr]);
140
140
  useEffect(function () {
141
141
  // 拉平数据
142
- if (Array.isArray(originFileList) && originFileList.length > 0) {
142
+ if (Array.isArray(originFileList)) {
143
143
  if (listType === 'text') {
144
144
  setFileList(originFileList.map(function (item) {
145
145
  var _a, _b, _c, _d;
package/dist/index.js CHANGED
@@ -1,61 +1,82 @@
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 BasicDemo from './DemoCom/BasicDemo';
18
- import FormDemo from './DemoCom/FormDemo';
19
- dayjs.locale(zhCn);
20
- ReactDOM.render(
21
- // <React.StrictMode>
22
- React.createElement(ConfigProvider, { locale: zhCN },
23
- React.createElement(BrowserRouter, null,
24
- React.createElement(Switch, null,
25
- React.createElement(Route, { exact: true, path: "/" },
26
- React.createElement(App, null)),
27
- React.createElement(Route, { exact: true, path: "/select" },
28
- React.createElement(Demo, null)),
29
- React.createElement(Route, { exact: true, path: "/tree-select" },
30
- React.createElement(TreeSelectDemo, null)),
31
- React.createElement(Route, { exact: true, path: "/tree" },
32
- React.createElement(TreeDemo, null)),
33
- React.createElement(Route, { exact: true, path: "/upload" },
34
- React.createElement(UploadDemo, null)),
35
- React.createElement(Route, { exact: true, path: "/collapse" },
36
- React.createElement(CollapseDemo, null)),
37
- React.createElement(Route, { exact: true, path: "/timeline" },
38
- React.createElement(TimelineDemo, null)),
39
- React.createElement(Route, { exact: true, path: "/wechat" },
40
- React.createElement(WeChatDemo, null)),
41
- React.createElement(Route, { exact: true, path: "/table" },
42
- React.createElement(TableDemo, null)),
43
- React.createElement(Route, { exact: true, path: "/basic" },
44
- React.createElement(BasicDemo, null)),
45
- React.createElement(Route, { exact: true, path: "/form" },
46
- React.createElement(FormDemo, null)),
47
- React.createElement(Route, { exact: true, path: "/test" },
48
- React.createElement("div", null,
49
- React.createElement("h1", null,
50
- React.createElement(Link, { to: "/select" }, "select")),
51
- React.createElement("h1", null,
52
- React.createElement(Link, { to: "/tree-select" }, "tree select")),
53
- React.createElement("h1", null,
54
- React.createElement(Link, { to: "/tree" }, "tree")),
55
- React.createElement("h1", null,
56
- React.createElement(Link, { to: "/upload" }, "upload"))))))),
57
- // </React.StrictMode>,
58
- document.getElementById('root'));
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 BasicDemo from './DemoCom/BasicDemo';
18
+ // import FormDemo from './DemoCom/FormDemo';
19
+ // dayjs.locale(zhCn);
20
+ // ReactDOM.render(
21
+ // // <React.StrictMode>
22
+ // <ConfigProvider locale={zhCN}>
23
+ // <BrowserRouter>
24
+ // <Switch>
25
+ // <Route exact path="/">
26
+ // <App />
27
+ // </Route>
28
+ // <Route exact path="/select">
29
+ // <Demo />
30
+ // </Route>
31
+ // <Route exact path="/tree-select">
32
+ // <TreeSelectDemo />
33
+ // </Route>
34
+ // <Route exact path="/tree">
35
+ // <TreeDemo />
36
+ // </Route>
37
+ // <Route exact path="/upload">
38
+ // <UploadDemo />
39
+ // </Route>
40
+ // <Route exact path="/collapse">
41
+ // <CollapseDemo />
42
+ // </Route>
43
+ // <Route exact path="/timeline">
44
+ // <TimelineDemo />
45
+ // </Route>
46
+ // <Route exact path="/wechat">
47
+ // <WeChatDemo />
48
+ // </Route>
49
+ // <Route exact path="/table">
50
+ // <TableDemo />
51
+ // </Route>
52
+ // <Route exact path="/basic">
53
+ // <BasicDemo />
54
+ // </Route>
55
+ // <Route exact path="/form">
56
+ // <FormDemo />
57
+ // </Route>
58
+ // <Route exact path="/test">
59
+ // <div>
60
+ // <h1>
61
+ // <Link to="/select">select</Link>
62
+ // </h1>
63
+ // <h1>
64
+ // <Link to="/tree-select">tree select</Link>
65
+ // </h1>
66
+ // <h1>
67
+ // <Link to="/tree">tree</Link>
68
+ // </h1>
69
+ // <h1>
70
+ // <Link to="/upload">upload</Link>
71
+ // </h1>
72
+ // </div>
73
+ // </Route>
74
+ // </Switch>
75
+ // </BrowserRouter>
76
+ // </ConfigProvider>,
77
+ // // </React.StrictMode>,
78
+ // document.getElementById('root')
79
+ // );
59
80
  export { default as Button } from './components/Button';
60
81
  export { default as Calendar } from './components/Calendar';
61
82
  export { default as Checkbox } from './components/Checkbox';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "2.3.6",
3
+ "version": "2.3.9",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",