ztxkui 1.9.8 → 1.9.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.
- package/dist/Demo.js +4 -12
- package/dist/components/EnhanceSelect/index.js +32 -6
- package/package.json +1 -1
package/dist/Demo.js
CHANGED
|
@@ -6,7 +6,7 @@ var selectStyle = { width: '200px' };
|
|
|
6
6
|
function request(options) {
|
|
7
7
|
return fetch(options.url + "?" + stringify(options.params), {
|
|
8
8
|
headers: {
|
|
9
|
-
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
9
|
+
'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiWUcyMTA2MDA2IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLlrovlrofnjq8iLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjE0MTcwMzkzNTgzNDMxMDY1NjEsMTQxNzA0MDY4MzI0NDA0ODM4NiwxNDE3MDQwODQyODM3MzE1NTg1LDE0MTcwNDEwNDM3Mjc2OTk5NzAsMTQxNzM3MjI0NTA4OTE3NzYwMSwxNDE3NjQ1NzYxMjI3MjQ3NjE3LDE0MTc3NDkwNTAwMTY0NDg1MTQsMTQxNzc0OTE2NDg4NTg1MjE2MiwxNDE4NDg2MTMwNjM1MDE4MjQxLDE0MTk4NjM2MzQ3NzE4MDgyNTgiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxMTIzNTk4ODE2NzM4Njc1MjAxLDE0MTcwMDQyMDMxOTY5MjgwMDEsMTQxNzAxNDExOTYwOTUyMDEyOSwxNDE3MDE0Njg1NTI1OTg3MzMwLDE0MTczNzAxNzQwMDA1ODI2NTgsMTQxNzY0NTE4OTIyOTAzOTYxOCwxNDE3NjQ2MjY2MTMzMzY4ODM0LDE0MTc2NTY3NTc1ODA4NDUwNTgsMTQxNzY1NzM0OTcxNTkwNjU2MiwxNDE5ODM0NDQ3NTU4MTg0OTYxIiwicG9zdF9uYW1lIjpudWxsLCJzY29wZSI6WyJhbGwiXSwiaW50ZXJ2aWV3X2lkIjpudWxsLCJleHAiOjE2Mzg3MzA0ODcsIm9yZ19uYW1lIjpudWxsLCJqdGkiOiJmNGE2Y2U1My1hYjU0LTRhYTctOTM1NS1iOWMzNzY4YWU1MGUiLCJtZW1iZXJfaWQiOjE0MDQ2ODk5NDUyOTg3MDIzMzcsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5Lia5Yqh5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJ1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iLCJ1c2VyIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbmlzdHJhdG9yLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlcixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MjAzMzI5ODE5Njc0NTAxMTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IuWui-Wuh-eOryIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWboueJqea1geenkeaKgOaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMzk3MDgxOTMwMzI4NDI0NDQ5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJZRzIxMDYwMDYiLCJyZXN1bWVfaWQiOm51bGx9.nxXBP4n23ZV7Oajz4umdl1e2iE4iyXAXvmZbXvrv5ZU',
|
|
10
10
|
},
|
|
11
11
|
method: options.method,
|
|
12
12
|
}).then(function (response) { return response.json(); });
|
|
@@ -15,6 +15,7 @@ function Demo() {
|
|
|
15
15
|
console.log('rerender');
|
|
16
16
|
var _a = useState([]), list = _a[0], setList = _a[1];
|
|
17
17
|
var _b = useState([]), defaultList = _b[0], setDefaultList = _b[1];
|
|
18
|
+
var _c = useState(''), value = _c[0], setValue = _c[1];
|
|
18
19
|
// 模拟接口请求
|
|
19
20
|
useEffect(function () {
|
|
20
21
|
var timeoutId = setTimeout(function () {
|
|
@@ -46,6 +47,7 @@ function Demo() {
|
|
|
46
47
|
projectName: '项目12',
|
|
47
48
|
},
|
|
48
49
|
]);
|
|
50
|
+
setValue('1462433051208761603');
|
|
49
51
|
}, 2000);
|
|
50
52
|
return function () {
|
|
51
53
|
if (timeoutId) {
|
|
@@ -61,18 +63,8 @@ function Demo() {
|
|
|
61
63
|
console.log(value, option, fullData);
|
|
62
64
|
} }),
|
|
63
65
|
React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E"),
|
|
64
|
-
React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
|
|
65
|
-
status: 50,
|
|
66
|
-
companyId: '1397074605412696066',
|
|
67
|
-
}), request: request, joinKey: "depName" }),
|
|
68
66
|
React.createElement("h2", null, "\u5F02\u6B65\u83B7\u53D6\u6570\u636E\uFF0C\u5E76\u7F13\u5B58\u6570\u636E"),
|
|
69
|
-
React.createElement(EnhanceSelect, { style: selectStyle, url: "http://192.168.0.83:8000/api/zmdms-user/list", params: JSON.stringify({
|
|
70
|
-
status: 50,
|
|
71
|
-
companyId: '1397074605412696066',
|
|
72
|
-
}), request: request, isCatch: true }),
|
|
73
67
|
React.createElement("h2", null, "\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22"),
|
|
74
|
-
React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.
|
|
75
|
-
depId: '1397081930328424449',
|
|
76
|
-
}), request: request, remoteSearch: true, titleKey: "projectName", defaultList: defaultList })));
|
|
68
|
+
React.createElement(EnhanceSelect, { style: selectStyle, placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.135:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value })));
|
|
77
69
|
}
|
|
78
70
|
export default Demo;
|
|
@@ -76,6 +76,7 @@ function EnhanceSelect(_a) {
|
|
|
76
76
|
var _f = useFetchState([]), selectList = _f[0], setSelectList = _f[1];
|
|
77
77
|
var _g = useFetchState(false), loading = _g[0], setLoading = _g[1];
|
|
78
78
|
var fetchId = useRef(0); // 请求Id，每次请求都会加1
|
|
79
|
+
var _h = useFetchState(false), firstLoading = _h[0], setFirstLoading = _h[1];
|
|
79
80
|
// 如果selectList 发生改变，那么触发onCompleted事件
|
|
80
81
|
useEffect(function () {
|
|
81
82
|
if (Array.isArray(selectList) && onCompleted) {
|
|
@@ -116,9 +117,9 @@ function EnhanceSelect(_a) {
|
|
|
116
117
|
});
|
|
117
118
|
}, [setSelectList, setLoading, transformData]);
|
|
118
119
|
// 远程搜索
|
|
119
|
-
var getRemoteDataHandle = useCallback(function (value) {
|
|
120
|
-
var _a;
|
|
120
|
+
var getRemoteDataHandle = useCallback(function (value, dataKeyValue) {
|
|
121
121
|
var searchKey = remoteSearchKey ? remoteSearchKey : titleKey;
|
|
122
|
+
var searchDataKey = dataKey;
|
|
122
123
|
var outParams = params;
|
|
123
124
|
try {
|
|
124
125
|
outParams = JSON.parse(params);
|
|
@@ -128,10 +129,17 @@ function EnhanceSelect(_a) {
|
|
|
128
129
|
// 利用闭包，存到当前请求的id
|
|
129
130
|
fetchId.current++;
|
|
130
131
|
var fetchIdClosure = fetchId.current;
|
|
132
|
+
var searchParams = {};
|
|
133
|
+
if (value) {
|
|
134
|
+
searchParams[searchKey] = value;
|
|
135
|
+
}
|
|
136
|
+
if (dataKeyValue) {
|
|
137
|
+
searchParams[searchDataKey] = dataKeyValue;
|
|
138
|
+
}
|
|
131
139
|
getData(request, {
|
|
132
140
|
url: url,
|
|
133
141
|
method: method,
|
|
134
|
-
params: __assign(__assign({ size: 50, page: 1 }, outParams),
|
|
142
|
+
params: __assign(__assign({ size: 50, page: 1 }, outParams), searchParams),
|
|
135
143
|
})
|
|
136
144
|
.then(function (resData) {
|
|
137
145
|
var _a, _b, _c;
|
|
@@ -165,6 +173,7 @@ function EnhanceSelect(_a) {
|
|
|
165
173
|
request,
|
|
166
174
|
remoteSearchKey,
|
|
167
175
|
titleKey,
|
|
176
|
+
dataKey,
|
|
168
177
|
setSelectList,
|
|
169
178
|
transformData,
|
|
170
179
|
setLoading,
|
|
@@ -172,7 +181,7 @@ function EnhanceSelect(_a) {
|
|
|
172
181
|
var searchHandle = function (value) {
|
|
173
182
|
// 当value有值时才进行搜索
|
|
174
183
|
if (value) {
|
|
175
|
-
getRemoteDataHandle(value);
|
|
184
|
+
getRemoteDataHandle(value, '');
|
|
176
185
|
}
|
|
177
186
|
};
|
|
178
187
|
var onSearchHandle = debounce(searchHandle, 300);
|
|
@@ -230,8 +239,25 @@ function EnhanceSelect(_a) {
|
|
|
230
239
|
return;
|
|
231
240
|
}
|
|
232
241
|
// console.log('TEST: 远程搜索');
|
|
233
|
-
|
|
234
|
-
|
|
242
|
+
if (!firstLoading) {
|
|
243
|
+
if (!restProps.value) {
|
|
244
|
+
getRemoteDataHandle('', '');
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
if (typeof restProps.value === 'string') {
|
|
248
|
+
setFirstLoading(true);
|
|
249
|
+
getRemoteDataHandle('', restProps.value);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
}, [
|
|
254
|
+
url,
|
|
255
|
+
remoteSearch,
|
|
256
|
+
getRemoteDataHandle,
|
|
257
|
+
restProps.value,
|
|
258
|
+
firstLoading,
|
|
259
|
+
setFirstLoading,
|
|
260
|
+
]);
|
|
235
261
|
// 数据合并
|
|
236
262
|
function concatData(originalData, newData) {
|
|
237
263
|
if (!newData) {
|