@pisell/private-materials 3.0.178 → 3.0.180

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 (13) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/meta.js +1 -1
  5. package/build/lowcode/render/default/view.js +2 -2
  6. package/build/lowcode/view.js +2 -2
  7. package/es/components/booking/forms/forms.js +18 -16
  8. package/es/components/booking/info/pet/index.js +116 -64
  9. package/es/components/booking/info/utils.js +1 -1
  10. package/lib/components/booking/forms/forms.js +9 -7
  11. package/lib/components/booking/info/pet/index.js +76 -28
  12. package/lib/components/booking/info/utils.js +1 -1
  13. package/package.json +2 -2
package/es/components/booking/forms/forms.js CHANGED
@@ -63,25 +63,27 @@ var Forms = Provider(function (props) {
63
63
  type: 'pisell1.goCustomFormAddData',
64
64
  data: _data,
65
65
  callback: function callback(res) {
66
- if (isAdd) {
67
- var obj = {};
68
- var _iterator = _createForOfIteratorHelper(res),
69
- _step;
70
- try {
71
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
72
- var item = _step.value;
73
- obj[item.key] = item.value;
74
- }
75
- } catch (err) {
76
- _iterator.e(err);
77
- } finally {
78
- _iterator.f();
66
+ var obj = {};
67
+ var _iterator = _createForOfIteratorHelper(res),
68
+ _step;
69
+ try {
70
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
71
+ var item = _step.value;
72
+ obj[item.key] = item.value;
79
73
  }
80
- var _val = _toConsumableArray(value[formDataConfig.form_id] || []);
81
- _val.push(obj);
74
+ } catch (err) {
75
+ _iterator.e(err);
76
+ } finally {
77
+ _iterator.f();
78
+ }
79
+ var _val = _toConsumableArray(value[formDataConfig.form_id] || []);
80
+ _val.push(obj);
81
+ if (isAdd) {
82
82
  onValueChange(formDataConfig, _val);
83
83
  }
84
- addCallback === null || addCallback === void 0 ? void 0 : addCallback(formDataConfig);
84
+ setTimeout(function () {
85
+ addCallback === null || addCallback === void 0 ? void 0 : addCallback(formDataConfig, obj);
86
+ }, 100);
85
87
  }
86
88
  });
87
89
  case 3:
package/es/components/booking/info/pet/index.js CHANGED
@@ -36,7 +36,7 @@ var defaultParams = {
36
36
  keyword: ''
37
37
  };
38
38
  var Pet = function Pet(props) {
39
- var _context$appHelper, _state2, _state2$bookingConfig, _state2$bookingConfig2, _state2$bookingConfig3, _state$bookingConfig3, _state$client$value2, _state$client9, _state$client9$value, _state$pet5, _state$pet5$formData, _state$pet5$formData$, _state$pet5$formData$2, _state$client11;
39
+ var _context$appHelper, _state2, _state2$bookingConfig, _state2$bookingConfig2, _state2$bookingConfig3, _state$bookingConfig3, _state$client$value2, _state$client10, _state$client10$value, _state$pet9, _state$pet9$formData, _state$pet9$formData$, _state$pet9$formData$2, _state$client12;
40
40
  var hideTitle = props.hideTitle,
41
41
  addButtonProps = props.addButtonProps,
42
42
  handleOpenModal = props.handleOpenModal,
@@ -124,7 +124,7 @@ var Pet = function Pet(props) {
124
124
  _list = []; // 只要不是 客户表单并且没选择客户, 都获取数据
125
125
  noClient = formData.data_range === 'customer' && isWalkIn((_state$client = state.client) === null || _state$client === void 0 ? void 0 : (_state$client$value = _state$client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id);
126
126
  if (noClient) {
127
- _context.next = 14;
127
+ _context.next = 16;
128
128
  break;
129
129
  }
130
130
  _values = _objectSpread(_objectSpread({
@@ -148,7 +148,15 @@ var Pet = function Pet(props) {
148
148
  setParams(_objectSpread(_objectSpread(_objectSpread({}, params), _params), {}, {
149
149
  total: (data === null || data === void 0 ? void 0 : data.count) || 0
150
150
  }));
151
- case 14:
151
+ _context.next = 17;
152
+ break;
153
+ case 16:
154
+ setParams(function (o) {
155
+ return _objectSpread(_objectSpread({}, o), {}, {
156
+ total: 0
157
+ });
158
+ });
159
+ case 17:
152
160
  dispatch({
153
161
  type: 'setPet',
154
162
  payload: {
@@ -159,7 +167,7 @@ var Pet = function Pet(props) {
159
167
  }
160
168
  });
161
169
  setLoading(false);
162
- case 16:
170
+ case 19:
163
171
  case "end":
164
172
  return _context.stop();
165
173
  }
@@ -169,6 +177,22 @@ var Pet = function Pet(props) {
169
177
  return _ref3.apply(this, arguments);
170
178
  };
171
179
  }();
180
+ var setPetOptions = function setPetOptions(options) {
181
+ var _state$pet, _state$pet$formData, _state$client3, _state$client3$value, _state$pet2, _state$pet2$formData;
182
+ var noClient = ((_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : (_state$pet$formData = _state$pet.formData) === null || _state$pet$formData === void 0 ? void 0 : _state$pet$formData[0].data_range) === 'customer' && isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : (_state$client3$value = _state$client3.value) === null || _state$client3$value === void 0 ? void 0 : _state$client3$value.id);
183
+ if (noClient) {
184
+ return;
185
+ }
186
+ dispatch({
187
+ type: 'setPet',
188
+ payload: {
189
+ formData: [_objectSpread(_objectSpread({}, (_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : (_state$pet2$formData = _state$pet2.formData) === null || _state$pet2$formData === void 0 ? void 0 : _state$pet2$formData[0]), {}, {
190
+ options: options
191
+ })],
192
+ pets: options
193
+ }
194
+ });
195
+ };
172
196
 
173
197
  /**
174
198
  * @title: 获取预约主体表单
@@ -189,8 +213,8 @@ var Pet = function Pet(props) {
189
213
  payload,
190
214
  _state$bookingDetail4,
191
215
  _state$bookingDetail5,
192
- _state$client3,
193
- _state$client3$value,
216
+ _state$client4,
217
+ _state$client4$value,
194
218
  records,
195
219
  _args2 = arguments;
196
220
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -243,7 +267,7 @@ var Pet = function Pet(props) {
243
267
  case 16:
244
268
  records = _context2.sent;
245
269
  console.log('records', records);
246
- values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] = sortFormValues(records, (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : (_state$client3$value = _state$client3.value) === null || _state$client3$value === void 0 ? void 0 : _state$client3$value.id);
270
+ values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] = sortFormValues(records, (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : (_state$client4$value = _state$client4.value) === null || _state$client4$value === void 0 ? void 0 : _state$client4$value.id);
247
271
  payload.value = values;
248
272
  setValueLoading(false);
249
273
  case 21:
@@ -269,67 +293,81 @@ var Pet = function Pet(props) {
269
293
  return _ref4.apply(this, arguments);
270
294
  };
271
295
  }();
296
+ var updateResult = function updateResult(res, item) {
297
+ var _state$pet3, _state$pet3$formData, _state$pet3$formData$;
298
+ var cur = _toConsumableArray(state.pet.value[petForm.form_id] || []);
299
+ var options = ((_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : (_state$pet3$formData = _state$pet3.formData) === null || _state$pet3$formData === void 0 ? void 0 : (_state$pet3$formData$ = _state$pet3$formData[0]) === null || _state$pet3$formData$ === void 0 ? void 0 : _state$pet3$formData$.options) || [];
300
+ if (res.type === 'delete') {
301
+ cur = cur.filter(function (d) {
302
+ return d.form_record_id !== item.form_record_id;
303
+ });
304
+ _addCallback();
305
+ } else {
306
+ var obj = {
307
+ customer: item === null || item === void 0 ? void 0 : item.customer,
308
+ form_id: petForm === null || petForm === void 0 ? void 0 : petForm.form_id
309
+ };
310
+ var _iterator = _createForOfIteratorHelper(res),
311
+ _step;
312
+ try {
313
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
314
+ var _item = _step.value;
315
+ obj[_item.key] = _item.value;
316
+ }
317
+ } catch (err) {
318
+ _iterator.e(err);
319
+ } finally {
320
+ _iterator.f();
321
+ }
322
+ cur = cur.map(function (d) {
323
+ return d.form_record_id === item.form_record_id ? obj : d;
324
+ });
325
+ options = options.map(function (d) {
326
+ if (d.form_record_id === item.form_record_id) {
327
+ return obj;
328
+ }
329
+ return d;
330
+ });
331
+ }
332
+ onValueChange({
333
+ values: _defineProperty({}, petForm.form_id, cur),
334
+ options: options
335
+ });
336
+ };
272
337
  var handleViewItem = useMemoizedFn(function (item) {
273
- var _state$client4, _state$client4$value;
338
+ var _state$client5, _state$client5$value;
274
339
  var _data = {
275
340
  formDataConfig: _objectSpread({}, petForm),
276
341
  record: item
277
342
  };
278
- if (petForm.data_range === 'customer' && !isWalkIn((_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : (_state$client4$value = _state$client4.value) === null || _state$client4$value === void 0 ? void 0 : _state$client4$value.id)) {
279
- var _state$client5, _state$client5$value;
280
- _data.customerId = (_state$client5 = state.client) === null || _state$client5 === void 0 ? void 0 : (_state$client5$value = _state$client5.value) === null || _state$client5$value === void 0 ? void 0 : _state$client5$value.id;
343
+ if (petForm.data_range === 'customer' && !isWalkIn((_state$client5 = state.client) === null || _state$client5 === void 0 ? void 0 : (_state$client5$value = _state$client5.value) === null || _state$client5$value === void 0 ? void 0 : _state$client5$value.id)) {
344
+ var _state$client6, _state$client6$value;
345
+ _data.customerId = (_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : (_state$client6$value = _state$client6.value) === null || _state$client6$value === void 0 ? void 0 : _state$client6$value.id;
281
346
  }
282
347
  state.action({
283
348
  type: 'pisell1.goCustomFormDetail',
284
349
  data: _data,
285
350
  callback: function callback(res) {
286
- var cur = _toConsumableArray(state.pet.value[petForm.form_id] || []);
287
- if (res.type === 'delete') {
288
- cur = cur.filter(function (d) {
289
- return d.form_record_id !== item.form_record_id;
290
- });
291
- } else {
292
- var obj = {
293
- customer: item === null || item === void 0 ? void 0 : item.customer
294
- };
295
- var _iterator = _createForOfIteratorHelper(res),
296
- _step;
297
- try {
298
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
299
- var _item = _step.value;
300
- obj[_item.key] = _item.value;
301
- }
302
- } catch (err) {
303
- _iterator.e(err);
304
- } finally {
305
- _iterator.f();
306
- }
307
- cur = cur.map(function (d) {
308
- return d.form_record_id === item.form_record_id ? obj : d;
309
- });
310
- }
311
- onValueChange({
312
- values: _defineProperty({}, petForm.form_id, cur)
313
- });
314
- _addCallback();
351
+ updateResult(res, item);
315
352
  }
316
353
  });
317
354
  });
318
355
  var handleEditItem = useMemoizedFn(function (item) {
319
- var _state$client6, _state$client6$value;
356
+ var _state$client7, _state$client7$value;
320
357
  var _data = {
321
358
  formDataConfig: _objectSpread({}, petForm),
322
359
  record: item
323
360
  };
324
- if (petForm.data_range === 'customer' && !isWalkIn((_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : (_state$client6$value = _state$client6.value) === null || _state$client6$value === void 0 ? void 0 : _state$client6$value.id)) {
325
- var _state$client7, _state$client7$value;
326
- _data.customerId = (_state$client7 = state.client) === null || _state$client7 === void 0 ? void 0 : (_state$client7$value = _state$client7.value) === null || _state$client7$value === void 0 ? void 0 : _state$client7$value.id;
361
+ if (petForm.data_range === 'customer' && !isWalkIn((_state$client7 = state.client) === null || _state$client7 === void 0 ? void 0 : (_state$client7$value = _state$client7.value) === null || _state$client7$value === void 0 ? void 0 : _state$client7$value.id)) {
362
+ var _state$client8, _state$client8$value;
363
+ _data.customerId = (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id;
327
364
  }
328
365
  state.action({
329
366
  type: 'pisell1.editCustomFormRecord',
330
367
  data: _data,
331
- callback: function callback() {
332
- _addCallback();
368
+ callback: function callback(res) {
369
+ console.log(res, 'ressss');
370
+ updateResult(res, item);
333
371
  }
334
372
  });
335
373
  });
@@ -345,24 +383,35 @@ var Pet = function Pet(props) {
345
383
  var onValueChange = useMemoizedFn(function (_ref5) {
346
384
  var values = _ref5.values,
347
385
  _ref5$edit = _ref5.edit,
348
- edit = _ref5$edit === void 0 ? true : _ref5$edit;
386
+ edit = _ref5$edit === void 0 ? true : _ref5$edit,
387
+ options = _ref5.options;
388
+ var updateObj = {};
389
+
390
+ // 如果传入options
391
+ if (options) {
392
+ var _state$pet4, _state$pet4$formData;
393
+ updateObj.formData = [_objectSpread(_objectSpread({}, (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : (_state$pet4$formData = _state$pet4.formData) === null || _state$pet4$formData === void 0 ? void 0 : _state$pet4$formData[0]), {}, {
394
+ options: options
395
+ })];
396
+ updateObj.pets = options;
397
+ }
349
398
  dispatch({
350
399
  type: 'setPet',
351
- payload: {
400
+ payload: _objectSpread({
352
401
  edit: edit,
353
402
  value: values
354
- }
403
+ }, updateObj)
355
404
  });
356
405
  });
357
406
 
358
407
  // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
359
408
  useEffect(function () {
360
- var _state$pet, _state$client8, _state$client8$value, _state$pet2;
409
+ var _state$pet5, _state$client9, _state$client9$value, _state$pet6;
361
410
  if (clientChangeNotSetPet) return;
362
411
  var changeFormValuesData = changeFormValues({
363
- values: ((_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value) || {},
364
- clientId: (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id,
365
- forms: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.formData) || []
412
+ values: ((_state$pet5 = state.pet) === null || _state$pet5 === void 0 ? void 0 : _state$pet5.value) || {},
413
+ clientId: (_state$client9 = state.client) === null || _state$client9 === void 0 ? void 0 : (_state$client9$value = _state$client9.value) === null || _state$client9$value === void 0 ? void 0 : _state$client9$value.id,
414
+ forms: ((_state$pet6 = state.pet) === null || _state$pet6 === void 0 ? void 0 : _state$pet6.formData) || []
366
415
  });
367
416
  setTimeout(function () {
368
417
  dispatch({
@@ -390,10 +439,10 @@ var Pet = function Pet(props) {
390
439
  setTimeout(function () {
391
440
  handleUpdateForm();
392
441
  }, 10);
393
- }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, state.renderType, petForm, clientChangeNotSetPet ? (_state$client9 = state.client) === null || _state$client9 === void 0 ? void 0 : (_state$client9$value = _state$client9.value) === null || _state$client9$value === void 0 ? void 0 : _state$client9$value.id : undefined]);
442
+ }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, state.renderType, petForm, clientChangeNotSetPet ? (_state$client10 = state.client) === null || _state$client10 === void 0 ? void 0 : (_state$client10$value = _state$client10.value) === null || _state$client10$value === void 0 ? void 0 : _state$client10$value.id : undefined]);
394
443
  var _addCallback = useMemoizedFn(function (_params) {
395
- var _state$pet3, _state$pet3$formData;
396
- var _formData = (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : (_state$pet3$formData = _state$pet3.formData) === null || _state$pet3$formData === void 0 ? void 0 : _state$pet3$formData[0];
444
+ var _state$pet7, _state$pet7$formData;
445
+ var _formData = (_state$pet7 = state.pet) === null || _state$pet7 === void 0 ? void 0 : (_state$pet7$formData = _state$pet7.formData) === null || _state$pet7$formData === void 0 ? void 0 : _state$pet7$formData[0];
397
446
  // if (_formData?.type === "multiple" || _formData?.type === "single") {
398
447
  getFormData({
399
448
  formData: _formData
@@ -409,8 +458,8 @@ var Pet = function Pet(props) {
409
458
  _addCallback(_params);
410
459
  });
411
460
  var loadMore = useMemo(function () {
412
- var _state$pet4, _state$pet4$formData, _state$pet4$formData$, _state$pet4$formData$2;
413
- var show = ((_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : (_state$pet4$formData = _state$pet4.formData) === null || _state$pet4$formData === void 0 ? void 0 : (_state$pet4$formData$ = _state$pet4$formData[0]) === null || _state$pet4$formData$ === void 0 ? void 0 : (_state$pet4$formData$2 = _state$pet4$formData$.options) === null || _state$pet4$formData$2 === void 0 ? void 0 : _state$pet4$formData$2.length) < params.total || 0;
461
+ var _state$pet8, _state$pet8$formData, _state$pet8$formData$, _state$pet8$formData$2;
462
+ var show = ((_state$pet8 = state.pet) === null || _state$pet8 === void 0 ? void 0 : (_state$pet8$formData = _state$pet8.formData) === null || _state$pet8$formData === void 0 ? void 0 : (_state$pet8$formData$ = _state$pet8$formData[0]) === null || _state$pet8$formData$ === void 0 ? void 0 : (_state$pet8$formData$2 = _state$pet8$formData$.options) === null || _state$pet8$formData$2 === void 0 ? void 0 : _state$pet8$formData$2.length) < params.total || 0;
414
463
  return show ? /*#__PURE__*/React.createElement("div", {
415
464
  className: "",
416
465
  style: {
@@ -426,9 +475,9 @@ var Pet = function Pet(props) {
426
475
  _addCallback(_params);
427
476
  }
428
477
  }, locales.getText('pisell2.text.load-more'))) : null;
429
- }, [loadLoading, params, (_state$pet5 = state.pet) === null || _state$pet5 === void 0 ? void 0 : (_state$pet5$formData = _state$pet5.formData) === null || _state$pet5$formData === void 0 ? void 0 : (_state$pet5$formData$ = _state$pet5$formData[0]) === null || _state$pet5$formData$ === void 0 ? void 0 : (_state$pet5$formData$2 = _state$pet5$formData$.options) === null || _state$pet5$formData$2 === void 0 ? void 0 : _state$pet5$formData$2.length]);
478
+ }, [loadLoading, params, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 ? void 0 : (_state$pet9$formData = _state$pet9.formData) === null || _state$pet9$formData === void 0 ? void 0 : (_state$pet9$formData$ = _state$pet9$formData[0]) === null || _state$pet9$formData$ === void 0 ? void 0 : (_state$pet9$formData$2 = _state$pet9$formData$.options) === null || _state$pet9$formData$2 === void 0 ? void 0 : _state$pet9$formData$2.length]);
430
479
  return useMemo(function () {
431
- var _state$client10;
480
+ var _state$client11;
432
481
  return /*#__PURE__*/React.createElement("div", {
433
482
  className: "pisell-lowcode__booking-pet-wraps"
434
483
  }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -440,8 +489,11 @@ var Pet = function Pet(props) {
440
489
  watch: {
441
490
  value: state.pet.value
442
491
  },
443
- addCallback: function addCallback() {
444
- _addCallback();
492
+ addCallback: function addCallback(formDataConfig, data) {
493
+ var _state$pet10, _state$pet10$formData, _state$pet10$formData2;
494
+ setPetOptions([_objectSpread(_objectSpread({}, data), {}, {
495
+ form_id: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_id
496
+ })].concat(_toConsumableArray(((_state$pet10 = state.pet) === null || _state$pet10 === void 0 ? void 0 : (_state$pet10$formData = _state$pet10.formData) === null || _state$pet10$formData === void 0 ? void 0 : (_state$pet10$formData2 = _state$pet10$formData[0]) === null || _state$pet10$formData2 === void 0 ? void 0 : _state$pet10$formData2.options) || [])));
445
497
  },
446
498
  loading: valueLoading,
447
499
  forms: state.pet.formData,
@@ -449,7 +501,7 @@ var Pet = function Pet(props) {
449
501
  modalOpen: state.modalOpen,
450
502
  value: state.pet.value,
451
503
  onChange: onValueChange,
452
- client: (_state$client10 = state.client) === null || _state$client10 === void 0 ? void 0 : _state$client10.value,
504
+ client: (_state$client11 = state.client) === null || _state$client11 === void 0 ? void 0 : _state$client11.value,
453
505
  customSelectProps: {
454
506
  loading: loading,
455
507
  handleViewItem: handleViewItem,
@@ -527,6 +579,6 @@ var Pet = function Pet(props) {
527
579
  }()
528
580
  }, addButtonProps)
529
581
  })));
530
- }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client11 = state.client) === null || _state$client11 === void 0 ? void 0 : _state$client11.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage]);
582
+ }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client12 = state.client) === null || _state$client12 === void 0 ? void 0 : _state$client12.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage]);
531
583
  };
532
584
  export default Pet;
package/es/components/booking/info/utils.js CHANGED
@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
88
88
  if (renderType === 'eventBooking') {
89
89
  return false;
90
90
  }
91
- var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
91
+ var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 7797];
92
92
  return booking4Shops.includes(shopId);
93
93
  };
package/lib/components/booking/forms/forms.js CHANGED
@@ -68,16 +68,18 @@ var Forms = (0, import_model.Provider)((props) => {
68
68
  type: "pisell1.goCustomFormAddData",
69
69
  data: _data,
70
70
  callback: (res) => {
71
+ let obj = {};
72
+ for (let item of res) {
73
+ obj[item.key] = item.value;
74
+ }
75
+ let _val = [...value[formDataConfig.form_id] || []];
76
+ _val.push(obj);
71
77
  if (isAdd) {
72
- let obj = {};
73
- for (let item of res) {
74
- obj[item.key] = item.value;
75
- }
76
- let _val = [...value[formDataConfig.form_id] || []];
77
- _val.push(obj);
78
78
  onValueChange(formDataConfig, _val);
79
79
  }
80
- addCallback == null ? void 0 : addCallback(formDataConfig);
80
+ setTimeout(() => {
81
+ addCallback == null ? void 0 : addCallback(formDataConfig, obj);
82
+ }, 100);
81
83
  }
82
84
  });
83
85
  }
package/lib/components/booking/info/pet/index.js CHANGED
@@ -113,6 +113,8 @@ var Pet = (props) => {
113
113
  ..._params,
114
114
  total: (data == null ? void 0 : data.count) || 0
115
115
  });
116
+ } else {
117
+ setParams((o) => ({ ...o, total: 0 }));
116
118
  }
117
119
  dispatch({
118
120
  type: "setPet",
@@ -128,6 +130,25 @@ var Pet = (props) => {
128
130
  });
129
131
  setLoading(false);
130
132
  };
133
+ const setPetOptions = (options) => {
134
+ var _a2, _b2, _c2, _d2, _e2, _f2;
135
+ const noClient = ((_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0].data_range) === "customer" && (0, import_utils2.isWalkIn)((_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.id);
136
+ if (noClient) {
137
+ return;
138
+ }
139
+ dispatch({
140
+ type: "setPet",
141
+ payload: {
142
+ formData: [
143
+ {
144
+ ...(_f2 = (_e2 = state.pet) == null ? void 0 : _e2.formData) == null ? void 0 : _f2[0],
145
+ options
146
+ }
147
+ ],
148
+ pets: options
149
+ }
150
+ });
151
+ };
131
152
  const getForms = async (isUpdateValue = true) => {
132
153
  var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
133
154
  let values = {
@@ -182,6 +203,40 @@ var Pet = (props) => {
182
203
  console.log("form_error", err);
183
204
  }
184
205
  };
206
+ const updateResult = (res, item) => {
207
+ var _a2, _b2, _c2;
208
+ let cur = [...state.pet.value[petForm.form_id] || []];
209
+ let options = ((_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || [];
210
+ if (res.type === "delete") {
211
+ cur = cur.filter(
212
+ (d) => d.form_record_id !== item.form_record_id
213
+ );
214
+ addCallback();
215
+ } else {
216
+ let obj = {
217
+ customer: item == null ? void 0 : item.customer,
218
+ form_id: petForm == null ? void 0 : petForm.form_id
219
+ };
220
+ for (let item2 of res) {
221
+ obj[item2.key] = item2.value;
222
+ }
223
+ cur = cur.map(
224
+ (d) => d.form_record_id === item.form_record_id ? obj : d
225
+ );
226
+ options = options.map((d) => {
227
+ if (d.form_record_id === item.form_record_id) {
228
+ return obj;
229
+ }
230
+ return d;
231
+ });
232
+ }
233
+ onValueChange({
234
+ values: {
235
+ [petForm.form_id]: cur
236
+ },
237
+ options
238
+ });
239
+ };
185
240
  const handleViewItem = (0, import_ahooks.useMemoizedFn)((item) => {
186
241
  var _a2, _b2, _c2, _d2;
187
242
  let _data = {
@@ -195,28 +250,7 @@ var Pet = (props) => {
195
250
  type: "pisell1.goCustomFormDetail",
196
251
  data: _data,
197
252
  callback: (res) => {
198
- let cur = [...state.pet.value[petForm.form_id] || []];
199
- if (res.type === "delete") {
200
- cur = cur.filter(
201
- (d) => d.form_record_id !== item.form_record_id
202
- );
203
- } else {
204
- let obj = {
205
- customer: item == null ? void 0 : item.customer
206
- };
207
- for (let item2 of res) {
208
- obj[item2.key] = item2.value;
209
- }
210
- cur = cur.map(
211
- (d) => d.form_record_id === item.form_record_id ? obj : d
212
- );
213
- }
214
- onValueChange({
215
- values: {
216
- [petForm.form_id]: cur
217
- }
218
- });
219
- addCallback();
253
+ updateResult(res, item);
220
254
  }
221
255
  });
222
256
  });
@@ -232,17 +266,30 @@ var Pet = (props) => {
232
266
  state.action({
233
267
  type: "pisell1.editCustomFormRecord",
234
268
  data: _data,
235
- callback: () => {
236
- addCallback();
269
+ callback: (res) => {
270
+ console.log(res, "ressss");
271
+ updateResult(res, item);
237
272
  }
238
273
  });
239
274
  });
240
- const onValueChange = (0, import_ahooks.useMemoizedFn)(({ values, edit = true }) => {
275
+ const onValueChange = (0, import_ahooks.useMemoizedFn)(({ values, edit = true, options }) => {
276
+ var _a2, _b2;
277
+ const updateObj = {};
278
+ if (options) {
279
+ updateObj.formData = [
280
+ {
281
+ ...(_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0],
282
+ options
283
+ }
284
+ ];
285
+ updateObj.pets = options;
286
+ }
241
287
  dispatch({
242
288
  type: "setPet",
243
289
  payload: {
244
290
  edit,
245
- value: values
291
+ value: values,
292
+ ...updateObj
246
293
  }
247
294
  });
248
295
  });
@@ -323,8 +370,9 @@ var Pet = (props) => {
323
370
  {
324
371
  hideTitle,
325
372
  watch: { value: state.pet.value },
326
- addCallback: () => {
327
- addCallback();
373
+ addCallback: (formDataConfig, data) => {
374
+ var _a3, _b2, _c2;
375
+ setPetOptions([{ ...data, form_id: formDataConfig == null ? void 0 : formDataConfig.form_id }, ...((_c2 = (_b2 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || []]);
328
376
  },
329
377
  loading: valueLoading,
330
378
  forms: state.pet.formData,
package/lib/components/booking/info/utils.js CHANGED
@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
83
83
  if (renderType === "eventBooking") {
84
84
  return false;
85
85
  }
86
- const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
86
+ const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 7797];
87
87
  return booking4Shops.includes(shopId);
88
88
  };
89
89
  // Annotate the CommonJS export names for ESM import in node:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/private-materials",
3
- "version": "3.0.178",
3
+ "version": "3.0.180",
4
4
  "main": "./lib/index.js",
5
5
  "module": "./es/index.js",
6
6
  "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
60
60
  "rc-virtual-list": "^3.11.3",
61
61
  "decimal.js": "^10.4.3",
62
62
  "@pisell/date-picker": "1.0.100",
63
- "@pisell/utils": "1.0.42",
64
63
  "@pisell/icon": "0.0.11",
64
+ "@pisell/utils": "1.0.42",
65
65
  "@pisell/materials": "3.0.52"
66
66
  },
67
67
  "peerDependencies": {