@zat-design/sisyphus-react 3.13.22-beta.2 → 3.13.22-beta.3

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 (5) hide show
  1. package/es/ProLayout/components/ProHeader/index.js +15 -19
  2. package/es/ProTable/hooks/useAntdTable.js +52 -29
  3. package/lib/ProLayout/components/ProHeader/index.js +15 -19
  4. package/lib/ProTable/hooks/useAntdTable.js +52 -29
  5. package/package.json +1 -1
package/es/ProLayout/components/ProHeader/index.js CHANGED
@@ -121,11 +121,11 @@ var ProHeader = props => {
121
121
  return null;
122
122
  }
123
123
  var onlyTag = tag && !label && !value;
124
- var tagRender = params => {
125
- if (Array.isArray(params === null || params === void 0 ? void 0 : params.tag) && params !== null && params !== void 0 && params.tag.length) {
124
+ var tagRender = parmas => {
125
+ if (Array.isArray(parmas === null || parmas === void 0 ? void 0 : parmas.tag) && parmas !== null && parmas !== void 0 && parmas.tag.length) {
126
126
  return /*#__PURE__*/_jsx(_Space, {
127
127
  size: 4,
128
- children: params.tag.map((tagItem, index) => {
128
+ children: parmas.tag.map((tagItem, index) => {
129
129
  return /*#__PURE__*/_jsx("div", {
130
130
  className: "pro-header-tag",
131
131
  children: tagItem
@@ -133,30 +133,26 @@ var ProHeader = props => {
133
133
  })
134
134
  });
135
135
  }
136
- return params !== null && params !== void 0 && params.tag ? /*#__PURE__*/_jsx("div", {
136
+ return parmas !== null && parmas !== void 0 && parmas.tag ? /*#__PURE__*/_jsx("div", {
137
137
  className: "pro-header-tag",
138
- children: params === null || params === void 0 ? void 0 : params.tag
138
+ children: parmas === null || parmas === void 0 ? void 0 : parmas.tag
139
139
  }) : null;
140
140
  };
141
141
 
142
142
  /** 单行渲染 */
143
- var valueRender = params => {
143
+ var valueRender = parmas => {
144
144
  return /*#__PURE__*/_jsxs(_Space, {
145
145
  size: 4,
146
- align: params !== null && params !== void 0 && params.tag ? 'baseline' : 'center',
147
- children: [params !== null && params !== void 0 && params.link ?
148
- /*#__PURE__*/
149
- // eslint-disable-next-line jsx-a11y/anchor-is-valid
150
- _jsx("a", {
151
- onClick: () => {
152
- var newWindow = window.open(params.link);
153
- newWindow.opener = null;
154
- },
155
- children: params === null || params === void 0 ? void 0 : params.value
156
- }) : params === null || params === void 0 ? void 0 : params.value, params !== null && params !== void 0 && params.copyable && isString(params === null || params === void 0 ? void 0 : params.value) ? /*#__PURE__*/_jsx(Copy, {
157
- text: params.value
146
+ align: parmas !== null && parmas !== void 0 && parmas.tag ? 'baseline' : 'center',
147
+ children: [parmas !== null && parmas !== void 0 && parmas.link ? /*#__PURE__*/_jsx("a", {
148
+ href: parmas.link,
149
+ rel: "noopener noreferrer",
150
+ target: "_blank",
151
+ children: parmas === null || parmas === void 0 ? void 0 : parmas.value
152
+ }) : parmas === null || parmas === void 0 ? void 0 : parmas.value, parmas !== null && parmas !== void 0 && parmas.copyable && isString(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? /*#__PURE__*/_jsx(Copy, {
153
+ text: parmas.value
158
154
  }) : null, tagRender({
159
- tag: params === null || params === void 0 ? void 0 : params.tag
155
+ tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
160
156
  })]
161
157
  });
162
158
  };
package/es/ProTable/hooks/useAntdTable.js CHANGED
@@ -152,13 +152,64 @@ function useAntdTable(service, options, useRequestOptions) {
152
152
  selectedRowKeys: []
153
153
  });
154
154
  };
155
+ var resetParams = () => {
156
+ setState({
157
+ searchValues: {},
158
+ allSelected: false,
159
+ selectedRecords: [],
160
+ selectedRowKeys: [],
161
+ extraFilter: {
162
+ filters: undefined,
163
+ sorter: undefined
164
+ }
165
+ });
166
+ };
167
+
168
+ // 重置查询条件: 页码还原、勾选清空
169
+ var onReset = refresh => {
170
+ form === null || form === void 0 || form.resetFields();
171
+ var newPage = {
172
+ pageNum: 1,
173
+ pageSize: page.pageSize
174
+ };
175
+ resetParams();
176
+ if (isResetQuery || refresh) {
177
+ onPageChange(newPage);
178
+ run(getTransformParams({
179
+ page: newPage
180
+ }));
181
+ }
182
+ };
155
183
 
156
184
  /**
157
185
  * 手动触发时，手动调用run
158
186
  */
159
187
  useEffect(() => {
160
188
  if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
161
- run(getTransformParams());
189
+ onReset(true);
190
+ }
191
+ }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
192
+
193
+ /**
194
+ * 手动触发时，手动调用run
195
+ */
196
+ useEffect(() => {
197
+ if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
198
+ // 当 extraParams 变化时,重置分页和选中状态
199
+ onPageChange(initPage);
200
+ setState({
201
+ searchValues: {},
202
+ allSelected: false,
203
+ selectedRecords: [],
204
+ selectedRowKeys: [],
205
+ extraFilter: {
206
+ filters: undefined,
207
+ sorter: undefined
208
+ }
209
+ });
210
+ run(getTransformParams({
211
+ page: initPage
212
+ }));
162
213
  }
163
214
  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
164
215
  useDeepCompareEffect(() => {
@@ -268,34 +319,6 @@ function useAntdTable(service, options, useRequestOptions) {
268
319
  page: newPage
269
320
  }, extraFilter), _values)));
270
321
  };
271
- var resetParams = page => {
272
- setState({
273
- searchValues: {},
274
- allSelected: false,
275
- selectedRecords: [],
276
- selectedRowKeys: [],
277
- extraFilter: {
278
- filters: undefined,
279
- sorter: undefined
280
- }
281
- });
282
- };
283
-
284
- // 重置查询条件: 页码还原、勾选清空
285
- var onReset = () => {
286
- form === null || form === void 0 || form.resetFields();
287
- var newPage = {
288
- pageNum: 1,
289
- pageSize: page.pageSize
290
- };
291
- resetParams(newPage);
292
- if (isResetQuery) {
293
- onPageChange(newPage);
294
- run(getTransformParams({
295
- page: newPage
296
- }));
297
- }
298
- };
299
322
  var refreshPage = res => {
300
323
  var transformResult = transformResponse ? transformResponse(res) : res || {};
301
324
  var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
package/lib/ProLayout/components/ProHeader/index.js CHANGED
@@ -128,11 +128,11 @@ var ProHeader = props => {
128
128
  return null;
129
129
  }
130
130
  var onlyTag = tag && !label && !value;
131
- var tagRender = params => {
132
- if (Array.isArray(params === null || params === void 0 ? void 0 : params.tag) && params !== null && params !== void 0 && params.tag.length) {
131
+ var tagRender = parmas => {
132
+ if (Array.isArray(parmas === null || parmas === void 0 ? void 0 : parmas.tag) && parmas !== null && parmas !== void 0 && parmas.tag.length) {
133
133
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
134
134
  size: 4,
135
- children: params.tag.map((tagItem, index) => {
135
+ children: parmas.tag.map((tagItem, index) => {
136
136
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
137
137
  className: "pro-header-tag",
138
138
  children: tagItem
@@ -140,30 +140,26 @@ var ProHeader = props => {
140
140
  })
141
141
  });
142
142
  }
143
- return params !== null && params !== void 0 && params.tag ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
143
+ return parmas !== null && parmas !== void 0 && parmas.tag ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
144
144
  className: "pro-header-tag",
145
- children: params === null || params === void 0 ? void 0 : params.tag
145
+ children: parmas === null || parmas === void 0 ? void 0 : parmas.tag
146
146
  }) : null;
147
147
  };
148
148
 
149
149
  /** 单行渲染 */
150
- var valueRender = params => {
150
+ var valueRender = parmas => {
151
151
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
152
152
  size: 4,
153
- align: params !== null && params !== void 0 && params.tag ? 'baseline' : 'center',
154
- children: [params !== null && params !== void 0 && params.link ?
155
- /*#__PURE__*/
156
- // eslint-disable-next-line jsx-a11y/anchor-is-valid
157
- (0, _jsxRuntime.jsx)("a", {
158
- onClick: () => {
159
- var newWindow = window.open(params.link);
160
- newWindow.opener = null;
161
- },
162
- children: params === null || params === void 0 ? void 0 : params.value
163
- }) : params === null || params === void 0 ? void 0 : params.value, params !== null && params !== void 0 && params.copyable && (0, _lodash.isString)(params === null || params === void 0 ? void 0 : params.value) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Copy, {
164
- text: params.value
153
+ align: parmas !== null && parmas !== void 0 && parmas.tag ? 'baseline' : 'center',
154
+ children: [parmas !== null && parmas !== void 0 && parmas.link ? /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
155
+ href: parmas.link,
156
+ rel: "noopener noreferrer",
157
+ target: "_blank",
158
+ children: parmas === null || parmas === void 0 ? void 0 : parmas.value
159
+ }) : parmas === null || parmas === void 0 ? void 0 : parmas.value, parmas !== null && parmas !== void 0 && parmas.copyable && (0, _lodash.isString)(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Copy, {
160
+ text: parmas.value
165
161
  }) : null, tagRender({
166
- tag: params === null || params === void 0 ? void 0 : params.tag
162
+ tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
167
163
  })]
168
164
  });
169
165
  };
package/lib/ProTable/hooks/useAntdTable.js CHANGED
@@ -160,13 +160,64 @@ function useAntdTable(service, options, useRequestOptions) {
160
160
  selectedRowKeys: []
161
161
  });
162
162
  };
163
+ var resetParams = () => {
164
+ setState({
165
+ searchValues: {},
166
+ allSelected: false,
167
+ selectedRecords: [],
168
+ selectedRowKeys: [],
169
+ extraFilter: {
170
+ filters: undefined,
171
+ sorter: undefined
172
+ }
173
+ });
174
+ };
175
+
176
+ // 重置查询条件: 页码还原、勾选清空
177
+ var onReset = refresh => {
178
+ form === null || form === void 0 || form.resetFields();
179
+ var newPage = {
180
+ pageNum: 1,
181
+ pageSize: page.pageSize
182
+ };
183
+ resetParams();
184
+ if (isResetQuery || refresh) {
185
+ onPageChange(newPage);
186
+ run(getTransformParams({
187
+ page: newPage
188
+ }));
189
+ }
190
+ };
163
191
 
164
192
  /**
165
193
  * 手动触发时，手动调用run
166
194
  */
167
195
  (0, _react.useEffect)(() => {
168
196
  if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
169
- run(getTransformParams());
197
+ onReset(true);
198
+ }
199
+ }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
200
+
201
+ /**
202
+ * 手动触发时，手动调用run
203
+ */
204
+ (0, _react.useEffect)(() => {
205
+ if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
206
+ // 当 extraParams 变化时,重置分页和选中状态
207
+ onPageChange(initPage);
208
+ setState({
209
+ searchValues: {},
210
+ allSelected: false,
211
+ selectedRecords: [],
212
+ selectedRowKeys: [],
213
+ extraFilter: {
214
+ filters: undefined,
215
+ sorter: undefined
216
+ }
217
+ });
218
+ run(getTransformParams({
219
+ page: initPage
220
+ }));
170
221
  }
171
222
  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
172
223
  (0, _ahooks.useDeepCompareEffect)(() => {
@@ -276,34 +327,6 @@ function useAntdTable(service, options, useRequestOptions) {
276
327
  page: newPage
277
328
  }, extraFilter), _values)));
278
329
  };
279
- var resetParams = page => {
280
- setState({
281
- searchValues: {},
282
- allSelected: false,
283
- selectedRecords: [],
284
- selectedRowKeys: [],
285
- extraFilter: {
286
- filters: undefined,
287
- sorter: undefined
288
- }
289
- });
290
- };
291
-
292
- // 重置查询条件: 页码还原、勾选清空
293
- var onReset = () => {
294
- form === null || form === void 0 || form.resetFields();
295
- var newPage = {
296
- pageNum: 1,
297
- pageSize: page.pageSize
298
- };
299
- resetParams(newPage);
300
- if (isResetQuery) {
301
- onPageChange(newPage);
302
- run(getTransformParams({
303
- page: newPage
304
- }));
305
- }
306
- };
307
330
  var refreshPage = res => {
308
331
  var transformResult = transformResponse ? transformResponse(res) : res || {};
309
332
  var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.22-beta.2",
3
+ "version": "3.13.22-beta.3",
4
4
  "license": "MIT",
5
5
  "engines": {
6
6
  "node": ">=18.19.0"