ztxkui 2.4.8 → 2.4.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.
|
@@ -17,7 +17,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
|
17
17
|
import React, { useEffect, useState, useCallback, useRef } from 'react';
|
|
18
18
|
import Table from 'components/Table';
|
|
19
19
|
import EnhanceSelect from 'components/EnhanceSelect';
|
|
20
|
-
import
|
|
20
|
+
import MaterialComp, { clearData } from './TestCom';
|
|
21
21
|
import { DatePicker } from 'index';
|
|
22
22
|
import dayjs from 'dayjs';
|
|
23
23
|
import update from 'immutability-helper';
|
|
@@ -30,14 +30,15 @@ function useGetTableRecords() {
|
|
|
30
30
|
test1: index + 1 + "-test1",
|
|
31
31
|
test2: index + 1 + "-test2",
|
|
32
32
|
test3: index + 1 + "-test3",
|
|
33
|
-
materialId: 1,
|
|
34
|
-
brand: '123',
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
33
|
+
// materialId: 1,
|
|
34
|
+
// brand: '123',
|
|
35
|
+
// brandId: '123',
|
|
36
|
+
// texture: 'HRB400E',
|
|
37
|
+
// textureId: 1,
|
|
38
|
+
// specification: 'Φ24mm*9m',
|
|
39
|
+
// specificationId: 1,
|
|
40
|
+
// placesteel: '萍钢',
|
|
41
|
+
// placesteelId: 1,
|
|
41
42
|
};
|
|
42
43
|
})), records = _a[0], setRecords = _a[1];
|
|
43
44
|
useEffect(function () {
|
|
@@ -463,7 +464,6 @@ var TableDemo = function () {
|
|
|
463
464
|
render: function (text, record, index) {
|
|
464
465
|
return (React.createElement(EnhanceSelect, { value: text, list: list1, dataKey: "id", titleKey: "materialDesc", dropdownMatchSelectWidth: 130, onChange: function (value, option, fullData) {
|
|
465
466
|
var newRecord = __assign({ materialId: value, materialDesc: fullData === null || fullData === void 0 ? void 0 : fullData.materialDesc }, clearData);
|
|
466
|
-
console.log(newRecord);
|
|
467
467
|
onEditableSaveHandle(newRecord, index);
|
|
468
468
|
} }));
|
|
469
469
|
},
|
|
@@ -486,7 +486,7 @@ var TableDemo = function () {
|
|
|
486
486
|
record.materialId !== preRecord.materialId);
|
|
487
487
|
},
|
|
488
488
|
render: function (text, record, index) {
|
|
489
|
-
return (React.createElement(
|
|
489
|
+
return (React.createElement(MaterialComp, { value: record, materialId: record.materialId, onChange: function (value) {
|
|
490
490
|
console.log(value);
|
|
491
491
|
var newRecord = __assign({}, value);
|
|
492
492
|
onEditableSaveHandle(newRecord, index);
|
|
@@ -690,10 +690,7 @@ var TableDemo = function () {
|
|
|
690
690
|
var onAddAndDelHandle = useCallback(function (type, index) {
|
|
691
691
|
var newRecords = recordsRef.current.slice();
|
|
692
692
|
if (type === 'add') {
|
|
693
|
-
var newItem = {
|
|
694
|
-
_isNewData: true,
|
|
695
|
-
id: Date.now() + "-" + index,
|
|
696
|
-
};
|
|
693
|
+
var newItem = __assign(__assign({}, newRecords[index]), { _isNewData: true, id: Date.now() + "-" + index });
|
|
697
694
|
newRecords.splice(index + 1, 0, newItem);
|
|
698
695
|
setRecords(newRecords);
|
|
699
696
|
setLengthChange(true);
|
package/dist/DemoCom/TestCom.js
CHANGED
|
@@ -45,7 +45,7 @@ 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
|
-
import React, { useMemo, useEffect, useState, useImperativeHandle, useCallback, memo, } from 'react';
|
|
48
|
+
import React, { useMemo, useEffect, useState, useImperativeHandle, useCallback, memo, useRef, } from 'react';
|
|
49
49
|
import Form from '../components/Form';
|
|
50
50
|
import SearchContainer from '../components/business/SearchContainer';
|
|
51
51
|
import Input from '../components/Input';
|
|
@@ -62,7 +62,7 @@ var SearchItem = SearchContainer.SearchItem, SearchLeft = SearchContainer.Search
|
|
|
62
62
|
function getAttributeList(params) {
|
|
63
63
|
return fetch("http://192.168.0.83:8000/api/zmdms-mdm-data/newmaterialproductlevel/get-attribute-list?" + stringify(params), {
|
|
64
64
|
headers: {
|
|
65
|
-
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
65
|
+
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiWUcyMTA3MDA4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2LDE0NjgwMzUzNTE2MjUyODU2MzQsMTQ4MDgzMjc1MTgxMzE4MTQ0MiIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjE0MTI2MDg3NDI5NTMyODc2ODIsMTQzODMyMjU0MzI5NTkyNjI3NCwxNDQzNDc1NDc1OTcyNzM0OTc3LDE0NDY4MTk0NjM2OTM4NDQ0ODIsMTQ2MDA4NTQyNjgxNTk1MDg0OSwxNDYyNjIyOTkyMzc1MjA5OTg2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ3Mjg0MDY3NjgyNDAxODk0NSwxNDgwODI5MDYzNTY0NTQxOTU0LDE0ODA4MjkzMzc5MzkxMzI0MTcsMTQ4MDgyOTQ5NTIyOTcyNjcyMiIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjQ4NDYzNzc1LCJvcmdfbmFtZSI6Iua5luWNl-S4reaLk-S_oeaBr-enkeaKgOaciemZkOWFrOWPuCIsImp0aSI6ImYwNjY2NTQ0LTdkNjQtNGIzOC1iMGZkLTJlNjM2MDYxYjJkOSIsIm1lbWJlcl9pZCI6MTQxMjk1MzIwNTI2OTUxNjI5MCwiY29tcGFueV9pZCI6MTM5NzA3NDYwNTQxMjY5NjA2Niwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOiLkuJrliqHkuIDpg6giLCJhdmF0YXIiOiIiLCJkYXRhX3JvbGVfbmFtZSI6ImFkbWluLHVzZXIsdXNlcixhZG1pbixhZG1pbix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJ1c2VyLGFkbWluaXN0cmF0b3IsYWRtaW4sYWRtaW5pc3RyYXRvcix1c2VyLHVzZXIsYWRtaW4sdXNlcix1c2VyLGFkbWluLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6MTQ1NzUyNzc2NTkxODUxNTUzNSwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEIiwiY29tcGFueV9uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui54mp5rWB56eR5oqA5pyJ6ZmQ5YWs5Y-4IiwiZGVwdF9pZCI6IjEzOTcwODE5MzAzMjg0MjQ0NDkiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.8jD8KIQOtJ5oUjfB68XQZfxlK_Gr6t7Foxa63FCGNQM',
|
|
66
66
|
},
|
|
67
67
|
method: 'get',
|
|
68
68
|
}).then(function (response) { return response.json(); });
|
|
@@ -70,7 +70,7 @@ function getAttributeList(params) {
|
|
|
70
70
|
function request(options) {
|
|
71
71
|
return fetch("http://192.168.0.83:8000" + options.url + "?" + stringify(options.params), {
|
|
72
72
|
headers: {
|
|
73
|
-
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
73
|
+
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiWUcyMTA3MDA4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2LDE0NjgwMzUzNTE2MjUyODU2MzQsMTQ4MDgzMjc1MTgxMzE4MTQ0MiIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjE0MTI2MDg3NDI5NTMyODc2ODIsMTQzODMyMjU0MzI5NTkyNjI3NCwxNDQzNDc1NDc1OTcyNzM0OTc3LDE0NDY4MTk0NjM2OTM4NDQ0ODIsMTQ2MDA4NTQyNjgxNTk1MDg0OSwxNDYyNjIyOTkyMzc1MjA5OTg2LDE0NjgwMzQ0MzcxNTc5NjE3MjksMTQ3Mjg0MDY3NjgyNDAxODk0NSwxNDgwODI5MDYzNTY0NTQxOTU0LDE0ODA4MjkzMzc5MzkxMzI0MTcsMTQ4MDgyOTQ5NTIyOTcyNjcyMiIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjQ4NDYzNzc1LCJvcmdfbmFtZSI6Iua5luWNl-S4reaLk-S_oeaBr-enkeaKgOaciemZkOWFrOWPuCIsImp0aSI6ImYwNjY2NTQ0LTdkNjQtNGIzOC1iMGZkLTJlNjM2MDYxYjJkOSIsIm1lbWJlcl9pZCI6MTQxMjk1MzIwNTI2OTUxNjI5MCwiY29tcGFueV9pZCI6MTM5NzA3NDYwNTQxMjY5NjA2Niwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOiLkuJrliqHkuIDpg6giLCJhdmF0YXIiOiIiLCJkYXRhX3JvbGVfbmFtZSI6ImFkbWluLHVzZXIsdXNlcixhZG1pbixhZG1pbix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLGFkbWluLGFkbWluIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJ1c2VyLGFkbWluaXN0cmF0b3IsYWRtaW4sYWRtaW5pc3RyYXRvcix1c2VyLHVzZXIsYWRtaW4sdXNlcix1c2VyLGFkbWluLGFkbWluIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6MTQ1NzUyNzc2NTkxODUxNTUzNSwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEIiwiY29tcGFueV9uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui54mp5rWB56eR5oqA5pyJ6ZmQ5YWs5Y-4IiwiZGVwdF9pZCI6IjEzOTcwODE5MzAzMjg0MjQ0NDkiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.8jD8KIQOtJ5oUjfB68XQZfxlK_Gr6t7Foxa63FCGNQM',
|
|
74
74
|
},
|
|
75
75
|
method: options.method,
|
|
76
76
|
}).then(function (response) {
|
|
@@ -138,9 +138,13 @@ var MaterialComp = function (_a) {
|
|
|
138
138
|
var value = _a.value, onChange = _a.onChange, _b = _a.controleType, controleType = _b === void 0 ? 'hide' : _b, materialRef = _a.materialRef, materialId = _a.materialId, onlyDetail = _a.onlyDetail;
|
|
139
139
|
var form = Form.useForm()[0];
|
|
140
140
|
var _c = useState(initConfigInfo), configInfo = _c[0], setConfigInfo = _c[1];
|
|
141
|
-
var _d = useState(
|
|
141
|
+
var _d = useState(initConfigInfo), aboutFieldObj = _d[0], setAboutFieldObj = _d[1];
|
|
142
142
|
var _e = useState(), allValue = _e[0], setAllValue = _e[1];
|
|
143
|
+
var onChangeRef = useRef();
|
|
143
144
|
console.log('test render');
|
|
145
|
+
useEffect(function () {
|
|
146
|
+
onChangeRef.current = onChange;
|
|
147
|
+
}, [onChange]);
|
|
144
148
|
var newParams = useMemo(function () { return ({
|
|
145
149
|
materialId: materialId,
|
|
146
150
|
}); }, [materialId]);
|
|
@@ -154,9 +158,9 @@ var MaterialComp = function (_a) {
|
|
|
154
158
|
}, [value, form, onlyDetail]);
|
|
155
159
|
useEffect(function () {
|
|
156
160
|
if (!onlyDetail && allValue) {
|
|
157
|
-
|
|
161
|
+
onChangeRef.current && onChangeRef.current(allValue);
|
|
158
162
|
}
|
|
159
|
-
}, [allValue,
|
|
163
|
+
}, [allValue, onlyDetail]);
|
|
160
164
|
/**
|
|
161
165
|
* @description 提供给外部调用的一些方法
|
|
162
166
|
*/
|
|
@@ -255,12 +259,15 @@ var MaterialComp = function (_a) {
|
|
|
255
259
|
* @description 下拉框改变触发事件
|
|
256
260
|
*/
|
|
257
261
|
var onSpecificationHandle = useCallback(function (value, option, fullData) {
|
|
258
|
-
setAllValue(function (preAllValue) {
|
|
262
|
+
setAllValue(function (preAllValue) {
|
|
263
|
+
var _a;
|
|
264
|
+
return (__assign(__assign({}, preAllValue), { specificationId: value !== null && value !== void 0 ? value : '', specification: (_a = fullData === null || fullData === void 0 ? void 0 : fullData.specificationName) !== null && _a !== void 0 ? _a : '' }));
|
|
265
|
+
});
|
|
259
266
|
}, []);
|
|
260
267
|
var onAboutChangeHandle = useCallback(function (value, option, fullData, key) {
|
|
261
268
|
setAllValue(function (preAllValue) {
|
|
262
269
|
var _a;
|
|
263
|
-
return (__assign(__assign({}, preAllValue), (_a = {}, _a[key + "Id"] = value, _a[key] = fullData[key + "Name"], _a)));
|
|
270
|
+
return (__assign(__assign({}, preAllValue), (_a = {}, _a[key + "Id"] = value !== null && value !== void 0 ? value : '', _a[key] = fullData ? fullData[key + "Name"] : '', _a)));
|
|
264
271
|
});
|
|
265
272
|
}, []);
|
|
266
273
|
var onInputChangeHandle = useCallback(function (e, key) {
|
|
@@ -385,16 +392,13 @@ var SpecificationsComp = function (_a) {
|
|
|
385
392
|
}
|
|
386
393
|
});
|
|
387
394
|
}); };
|
|
388
|
-
var onValuesChangeHandle = function (changedValues, allValues) {
|
|
389
|
-
setFormValue(allValues);
|
|
390
|
-
};
|
|
391
395
|
return (React.createElement(React.Fragment, null,
|
|
392
396
|
React.createElement(EnhanceSelect, { url: listDataAbout[objKey].url, params: newParams, defaultList: defaultList, dataKey: "id", titleKey: "specificationName", mustHasParams: "materialId", disabled: disabled, value: value, onChange: onChange, dropdownMatchSelectWidth: 130, isCatch: true, method: "GET", request: request }),
|
|
393
397
|
React.createElement(Button, { type: "primary", size: "small", disabled: disabled, onClick: openModal }, "\u65B0\u5EFA"),
|
|
394
398
|
React.createElement(Modal, { visible: visible, loading: false, onCancel: closeModal, maskClosable: false, title: "\u9009\u62E9\u89C4\u683C", width: "60%", footer: React.createElement(React.Fragment, null,
|
|
395
399
|
React.createElement(Button, { type: "default", onClick: closeModal }, "\u53D6\u6D88"),
|
|
396
400
|
React.createElement(Button, { type: "primary", onClick: onSureHandle }, "\u6DFB\u52A0")) },
|
|
397
|
-
React.createElement(Form, { form: form, name: "specifications-form"
|
|
401
|
+
React.createElement(Form, { form: form, name: "specifications-form" },
|
|
398
402
|
React.createElement(SearchContainer, null,
|
|
399
403
|
React.createElement(SearchLeft, null, Array.isArray(config) &&
|
|
400
404
|
config.map(function (item, index) { return (React.createElement(React.Fragment, { key: index },
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { SpinProps } from 'antd/es/spin';
|
|
2
3
|
export interface IContainer {
|
|
3
4
|
loading?: boolean;
|
|
4
5
|
className?: string;
|
|
5
6
|
containerRef?: any;
|
|
7
|
+
spinProps?: SpinProps;
|
|
6
8
|
}
|
|
7
9
|
declare const Container: React.FC<IContainer>;
|
|
8
10
|
export default Container;
|
|
@@ -24,11 +24,11 @@ import React from 'react';
|
|
|
24
24
|
import { Spin } from 'antd';
|
|
25
25
|
import classNames from 'classnames';
|
|
26
26
|
var Container = function (_a) {
|
|
27
|
-
var loading = _a.loading, children = _a.children, className = _a.className, containerRef = _a.containerRef, restProps = __rest(_a, ["loading", "children", "className", "containerRef"]);
|
|
27
|
+
var loading = _a.loading, children = _a.children, className = _a.className, containerRef = _a.containerRef, spinProps = _a.spinProps, restProps = __rest(_a, ["loading", "children", "className", "containerRef", "spinProps"]);
|
|
28
28
|
var classes = classNames('zt-container', className);
|
|
29
29
|
return (React.createElement("div", __assign({ className: classes }, restProps, { ref: containerRef }),
|
|
30
30
|
loading && (React.createElement("div", { className: "zt-container__loading" },
|
|
31
|
-
React.createElement(Spin, { size: "large", spinning: loading }))),
|
|
31
|
+
React.createElement(Spin, __assign({ size: "large", spinning: loading }, spinProps)))),
|
|
32
32
|
children));
|
|
33
33
|
};
|
|
34
34
|
export default Container;
|