@pisell/private-materials 6.3.35 → 6.3.36
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/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.js +1 -1
- package/build/lowcode/view.js +1 -1
- package/es/components/appointmentBooking/components/ConfirmInformation/index.js +15 -9
- package/es/components/booking/components/customSelect/index.js +1 -1
- package/es/components/booking/forms/footer.js +24 -10
- package/es/components/booking/info/client/index.js +28 -13
- package/es/components/booking/info/clientVariant/hooks/useClientFn.js +14 -8
- package/es/components/booking/info/clientVariant/vertical/SelectDrawer.js +10 -2
- package/es/components/booking/locales.d.ts +3 -0
- package/es/components/booking/locales.js +6 -3
- package/es/plus/contactInfoModal/index.d.ts +1 -0
- package/es/plus/contactInfoModal/index.js +1 -0
- package/lib/components/appointmentBooking/components/ConfirmInformation/index.js +5 -0
- package/lib/components/booking/components/customSelect/index.js +1 -1
- package/lib/components/booking/forms/footer.js +29 -11
- package/lib/components/booking/info/client/index.js +14 -1
- package/lib/components/booking/info/clientVariant/hooks/useClientFn.js +6 -1
- package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.js +11 -4
- package/lib/components/booking/locales.d.ts +3 -0
- package/lib/components/booking/locales.js +6 -3
- package/lib/plus/contactInfoModal/index.d.ts +1 -0
- package/lib/plus/contactInfoModal/index.js +1 -0
- package/package.json +2 -2
|
@@ -344,7 +344,7 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
344
344
|
var handleSubmit = /*#__PURE__*/function () {
|
|
345
345
|
var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
|
|
346
346
|
var _utils$businessUtils, _utils$businessUtils$;
|
|
347
|
-
var _utils$businessUtils2, _utils$businessUtils3, contacts_info, _contacts_info, _contacts_info2, _contacts_info3, newPhone;
|
|
347
|
+
var _utils$businessUtils2, _utils$businessUtils3, contacts_info, _contacts_info, _contacts_info2, _contacts_info3, _contacts_info4, _contacts_info5, newPhone, _contacts_info6, _contacts_info7;
|
|
348
348
|
return _regeneratorRuntime().wrap(function _callee6$(_context6) {
|
|
349
349
|
while (1) switch (_context6.prev = _context6.next) {
|
|
350
350
|
case 0:
|
|
@@ -363,7 +363,7 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
363
363
|
contacts_info = null;
|
|
364
364
|
_context6.prev = 5;
|
|
365
365
|
if (!showContactInfo) {
|
|
366
|
-
_context6.next =
|
|
366
|
+
_context6.next = 14;
|
|
367
367
|
break;
|
|
368
368
|
}
|
|
369
369
|
_context6.next = 9;
|
|
@@ -376,24 +376,30 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
376
376
|
country_code: ((_contacts_info3 = contacts_info) === null || _contacts_info3 === void 0 || (_contacts_info3 = _contacts_info3.phone) === null || _contacts_info3 === void 0 ? void 0 : _contacts_info3.countryCode) || ''
|
|
377
377
|
};
|
|
378
378
|
contacts_info.phone = newPhone;
|
|
379
|
+
// 处理dispaly_name
|
|
380
|
+
if ((_contacts_info4 = contacts_info) !== null && _contacts_info4 !== void 0 && _contacts_info4.first_name || (_contacts_info5 = contacts_info) !== null && _contacts_info5 !== void 0 && _contacts_info5.last_name) {
|
|
381
|
+
contacts_info.display_name = "".concat(((_contacts_info6 = contacts_info) === null || _contacts_info6 === void 0 ? void 0 : _contacts_info6.first_name) || '', " ").concat(((_contacts_info7 = contacts_info) === null || _contacts_info7 === void 0 ? void 0 : _contacts_info7.last_name) || '');
|
|
382
|
+
} else {
|
|
383
|
+
contacts_info.display_name = '';
|
|
384
|
+
}
|
|
379
385
|
console.log('contacts_info', contacts_info);
|
|
380
|
-
case
|
|
381
|
-
_context6.next =
|
|
386
|
+
case 14:
|
|
387
|
+
_context6.next = 20;
|
|
382
388
|
break;
|
|
383
|
-
case
|
|
384
|
-
_context6.prev =
|
|
389
|
+
case 16:
|
|
390
|
+
_context6.prev = 16;
|
|
385
391
|
_context6.t0 = _context6["catch"](5);
|
|
386
392
|
console.log('error', _context6.t0);
|
|
387
393
|
return _context6.abrupt("return");
|
|
388
|
-
case
|
|
394
|
+
case 20:
|
|
389
395
|
handleNext({
|
|
390
396
|
contacts_info: contacts_info
|
|
391
397
|
});
|
|
392
|
-
case
|
|
398
|
+
case 21:
|
|
393
399
|
case "end":
|
|
394
400
|
return _context6.stop();
|
|
395
401
|
}
|
|
396
|
-
}, _callee6, null, [[5,
|
|
402
|
+
}, _callee6, null, [[5, 16]]);
|
|
397
403
|
}));
|
|
398
404
|
return function handleSubmit() {
|
|
399
405
|
return _ref9.apply(this, arguments);
|
|
@@ -439,7 +439,7 @@ var CustomSelect = function CustomSelect(props, ref) {
|
|
|
439
439
|
marginTop: 16,
|
|
440
440
|
height: 44
|
|
441
441
|
},
|
|
442
|
-
placeholder: locales.getText('pisell2.text.search'),
|
|
442
|
+
placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
|
|
443
443
|
value: search,
|
|
444
444
|
allowClear: true,
|
|
445
445
|
onChange: function onChange(e) {
|
|
@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
|
|
|
9
9
|
import SendModal from "./sendModal";
|
|
10
10
|
import { locales } from '@pisell/utils';
|
|
11
11
|
var Footer = function Footer(_ref) {
|
|
12
|
-
var _state$
|
|
12
|
+
var _state$client2, _state$contacts_info2, _state$form, _state$client3;
|
|
13
13
|
var state = _ref.state,
|
|
14
14
|
reload = _ref.reload;
|
|
15
15
|
var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
|
|
@@ -38,17 +38,31 @@ var Footer = function Footer(_ref) {
|
|
|
38
38
|
};
|
|
39
39
|
}();
|
|
40
40
|
var defaultValues = useMemo(function () {
|
|
41
|
-
var _state$
|
|
41
|
+
var _state$contacts_info, _state$client;
|
|
42
|
+
// 优先取contacts_info中的phone和email,如果不存在则取客户信息中的phone和email
|
|
43
|
+
var _ref3 = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || {},
|
|
44
|
+
contactsEmail = _ref3.email,
|
|
45
|
+
contactsPhone = _ref3.phone;
|
|
46
|
+
var _ref4 = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
|
|
47
|
+
clientEmail = _ref4.email,
|
|
48
|
+
clientPhone = _ref4.phone,
|
|
49
|
+
clientCode = _ref4.country_calling_code;
|
|
50
|
+
var email = contactsEmail || clientEmail;
|
|
51
|
+
var phone = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.phone) || clientPhone;
|
|
52
|
+
var code = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.country_calling_code) || clientCode || '+61';
|
|
53
|
+
if (!code.startsWith('+')) {
|
|
54
|
+
code = "+".concat(code);
|
|
55
|
+
}
|
|
42
56
|
return {
|
|
43
|
-
sendSms: !!
|
|
44
|
-
sendEmail: !!
|
|
45
|
-
email:
|
|
57
|
+
sendSms: !!phone,
|
|
58
|
+
sendEmail: !!email,
|
|
59
|
+
email: email,
|
|
46
60
|
phone: {
|
|
47
|
-
code:
|
|
48
|
-
phone:
|
|
61
|
+
code: code,
|
|
62
|
+
phone: phone
|
|
49
63
|
}
|
|
50
64
|
};
|
|
51
|
-
}, [(_state$
|
|
65
|
+
}, [(_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value, (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.value]);
|
|
52
66
|
if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
|
|
53
67
|
return null;
|
|
54
68
|
}
|
|
@@ -65,8 +79,8 @@ var Footer = function Footer(_ref) {
|
|
|
65
79
|
block: true,
|
|
66
80
|
type: "primary",
|
|
67
81
|
onClick: handleOpen
|
|
68
|
-
}, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
|
|
69
|
-
refreshKey: (_state$
|
|
82
|
+
}, locales.getText('pisell2.text.send-form-reminder')), open && /*#__PURE__*/React.createElement(SendModal, {
|
|
83
|
+
refreshKey: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id,
|
|
70
84
|
open: open,
|
|
71
85
|
onCancel: function onCancel() {
|
|
72
86
|
return setOpen(false);
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
2
|
var _excluded = ["customer_id"];
|
|
3
3
|
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
|
|
4
|
-
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
5
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
6
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
7
|
-
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
8
4
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
9
5
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
10
6
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
7
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
12
8
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
9
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
10
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
11
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
12
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
13
13
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
14
14
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
15
15
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
@@ -84,7 +84,7 @@ var Client = function Client() {
|
|
|
84
84
|
}, [state.disabledEdit]);
|
|
85
85
|
var getClients = /*#__PURE__*/function () {
|
|
86
86
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
87
|
-
var customer_id, resetParams, _setLoading, _state$client, api, data, list, _payload, customerItem, totalList;
|
|
87
|
+
var customer_id, resetParams, _setLoading, _state$client, api, withKey, data, list, _payload, customerItem, totalList;
|
|
88
88
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
89
89
|
while (1) switch (_context.prev = _context.next) {
|
|
90
90
|
case 0:
|
|
@@ -101,14 +101,20 @@ var Client = function Client() {
|
|
|
101
101
|
}
|
|
102
102
|
// let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
|
|
103
103
|
_setLoading(true);
|
|
104
|
-
api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClientsEs;
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClientsEs; // 默认返回用户的联系信息
|
|
105
|
+
withKey = _toConsumableArray((resetParams === null || resetParams === void 0 ? void 0 : resetParams.with) || []);
|
|
106
|
+
if (!withKey.includes('contactsInfo')) {
|
|
107
|
+
withKey.push('contactsInfo');
|
|
108
|
+
}
|
|
109
|
+
_context.next = 8;
|
|
110
|
+
return api(_objectSpread(_objectSpread({}, resetParams), {}, {
|
|
111
|
+
with: withKey
|
|
112
|
+
}, !state.isFranchisee ? {
|
|
107
113
|
_config: {
|
|
108
114
|
abort: true
|
|
109
115
|
}
|
|
110
116
|
} : {}));
|
|
111
|
-
case
|
|
117
|
+
case 8:
|
|
112
118
|
data = _context.sent;
|
|
113
119
|
list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
|
|
114
120
|
return _objectSpread(_objectSpread({}, d), {}, {
|
|
@@ -145,7 +151,7 @@ var Client = function Client() {
|
|
|
145
151
|
setLoadLoading(false);
|
|
146
152
|
isLoadClient = true;
|
|
147
153
|
return _context.abrupt("return", {});
|
|
148
|
-
case
|
|
154
|
+
case 21:
|
|
149
155
|
case "end":
|
|
150
156
|
return _context.stop();
|
|
151
157
|
}
|
|
@@ -420,6 +426,15 @@ var Client = function Client() {
|
|
|
420
426
|
// searchChange('');
|
|
421
427
|
},
|
|
422
428
|
optionRender: function optionRender(item) {
|
|
429
|
+
console.log('render_optionRender', item);
|
|
430
|
+
// 显示优先级:如果客户中存在email或phone,则优先显示,否则显示联系信息中的email和phone
|
|
431
|
+
var displayEmail = item === null || item === void 0 ? void 0 : item.email;
|
|
432
|
+
var displayPhone = item === null || item === void 0 ? void 0 : item.phone;
|
|
433
|
+
if (!displayEmail && !displayPhone) {
|
|
434
|
+
var _item$contacts_info, _item$contacts_info2;
|
|
435
|
+
displayEmail = item === null || item === void 0 || (_item$contacts_info = item.contacts_info) === null || _item$contacts_info === void 0 || (_item$contacts_info = _item$contacts_info.value) === null || _item$contacts_info === void 0 ? void 0 : _item$contacts_info.email;
|
|
436
|
+
displayPhone = item === null || item === void 0 || (_item$contacts_info2 = item.contacts_info) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.value) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.phone) === null || _item$contacts_info2 === void 0 ? void 0 : _item$contacts_info2.phone;
|
|
437
|
+
}
|
|
423
438
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
|
|
424
439
|
className: "pisell-lowcode__booking-client-list-item-avatar",
|
|
425
440
|
src: image.ali(item.cover, 100) || undefined,
|
|
@@ -432,11 +447,11 @@ var Client = function Client() {
|
|
|
432
447
|
className: "pisell-lowcode__booking-client-list-item-info-name"
|
|
433
448
|
}, getNickname(item)), /*#__PURE__*/React.createElement("div", {
|
|
434
449
|
className: "pisell-lowcode__booking-client-list-item-info-desc"
|
|
435
|
-
},
|
|
450
|
+
}, displayEmail ? /*#__PURE__*/React.createElement("div", {
|
|
436
451
|
className: ""
|
|
437
|
-
},
|
|
452
|
+
}, displayEmail) : null, displayPhone ? /*#__PURE__*/React.createElement("div", {
|
|
438
453
|
className: ""
|
|
439
|
-
},
|
|
454
|
+
}, displayPhone) : null), /*#__PURE__*/React.createElement("div", {
|
|
440
455
|
className: 'pisell-lowcode__booking-client-list-item-info-waiver',
|
|
441
456
|
title: getWaiverTitle(item.waiver_form)
|
|
442
457
|
}, (item.waiver_form || []).map(function (item) {
|
|
@@ -76,7 +76,7 @@ var useClientFn = function useClientFn(_params) {
|
|
|
76
76
|
}, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id]);
|
|
77
77
|
var getClients = /*#__PURE__*/function () {
|
|
78
78
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, returnResult) {
|
|
79
|
-
var customer_id, customer_ids, resetParams, _setLoading, _state$client, api, data, list, _payload, customerItem, totalList;
|
|
79
|
+
var customer_id, customer_ids, resetParams, _setLoading, _state$client, api, withKey, data, list, _payload, customerItem, totalList;
|
|
80
80
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
81
81
|
while (1) switch (_context.prev = _context.next) {
|
|
82
82
|
case 0:
|
|
@@ -93,8 +93,12 @@ var useClientFn = function useClientFn(_params) {
|
|
|
93
93
|
}
|
|
94
94
|
_setLoading(true);
|
|
95
95
|
api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClients;
|
|
96
|
-
|
|
97
|
-
|
|
96
|
+
withKey = _toConsumableArray((resetParams === null || resetParams === void 0 ? void 0 : resetParams.with) || []);
|
|
97
|
+
if (!withKey.includes('contactsInfo')) {
|
|
98
|
+
withKey.push('contactsInfo');
|
|
99
|
+
}
|
|
100
|
+
_context.next = 8;
|
|
101
|
+
return api(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, resetParams), resetParams.search ? {
|
|
98
102
|
num: 10
|
|
99
103
|
} : {}), state.isFranchisee ? {
|
|
100
104
|
franchisee_customer_ids: customer_ids
|
|
@@ -104,8 +108,10 @@ var useClientFn = function useClientFn(_params) {
|
|
|
104
108
|
_config: {
|
|
105
109
|
abort: true
|
|
106
110
|
}
|
|
107
|
-
} : {})
|
|
108
|
-
|
|
111
|
+
} : {}), {}, {
|
|
112
|
+
with: withKey
|
|
113
|
+
}));
|
|
114
|
+
case 8:
|
|
109
115
|
data = _context.sent;
|
|
110
116
|
list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
|
|
111
117
|
var _d$form_record;
|
|
@@ -120,11 +126,11 @@ var useClientFn = function useClientFn(_params) {
|
|
|
120
126
|
});
|
|
121
127
|
});
|
|
122
128
|
if (!returnResult) {
|
|
123
|
-
_context.next =
|
|
129
|
+
_context.next = 12;
|
|
124
130
|
break;
|
|
125
131
|
}
|
|
126
132
|
return _context.abrupt("return", list);
|
|
127
|
-
case
|
|
133
|
+
case 12:
|
|
128
134
|
_payload = {
|
|
129
135
|
clients: list
|
|
130
136
|
}; // 有传递, 则表示新增客户之后刷新列表的, 应该默认选中
|
|
@@ -163,7 +169,7 @@ var useClientFn = function useClientFn(_params) {
|
|
|
163
169
|
setLoading(false);
|
|
164
170
|
setLoadLoading(false);
|
|
165
171
|
return _context.abrupt("return", {});
|
|
166
|
-
case
|
|
172
|
+
case 23:
|
|
167
173
|
case "end":
|
|
168
174
|
return _context.stop();
|
|
169
175
|
}
|
|
@@ -323,6 +323,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
|
|
|
323
323
|
return _ref4.apply(this, arguments);
|
|
324
324
|
};
|
|
325
325
|
}();
|
|
326
|
+
console.log('options7777', options);
|
|
326
327
|
return /*#__PURE__*/React.createElement(Drawer, {
|
|
327
328
|
showGoBack: showHeader,
|
|
328
329
|
title: showHeader && locales.getText('pisell2.text.select-customer'),
|
|
@@ -335,7 +336,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
|
|
|
335
336
|
margin: '16px 0',
|
|
336
337
|
height: 44
|
|
337
338
|
},
|
|
338
|
-
placeholder: locales.getText('pisell2.text.search'),
|
|
339
|
+
placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
|
|
339
340
|
value: search,
|
|
340
341
|
allowClear: true,
|
|
341
342
|
onChange: function onChange(e) {
|
|
@@ -376,6 +377,13 @@ var SelectDrawer = function SelectDrawer(props, ref) {
|
|
|
376
377
|
delay: 500
|
|
377
378
|
}, !!options.length ? options.map(function (item) {
|
|
378
379
|
var _holder$form2;
|
|
380
|
+
var displayEmail = item === null || item === void 0 ? void 0 : item.email;
|
|
381
|
+
var displayPhone = item === null || item === void 0 ? void 0 : item.phone;
|
|
382
|
+
if (!displayEmail && !displayPhone) {
|
|
383
|
+
var _item$contacts_info, _item$contacts_info2;
|
|
384
|
+
displayEmail = item === null || item === void 0 || (_item$contacts_info = item.contacts_info) === null || _item$contacts_info === void 0 || (_item$contacts_info = _item$contacts_info.value) === null || _item$contacts_info === void 0 ? void 0 : _item$contacts_info.email;
|
|
385
|
+
displayPhone = item === null || item === void 0 || (_item$contacts_info2 = item.contacts_info) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.value) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.phone) === null || _item$contacts_info2 === void 0 ? void 0 : _item$contacts_info2.phone;
|
|
386
|
+
}
|
|
379
387
|
return /*#__PURE__*/React.createElement("div", {
|
|
380
388
|
className: "vertical-client-select-drawer-content-item",
|
|
381
389
|
key: item.id
|
|
@@ -385,7 +393,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
|
|
|
385
393
|
},
|
|
386
394
|
cover: item.cover,
|
|
387
395
|
title: getNickname(item),
|
|
388
|
-
desc: [
|
|
396
|
+
desc: [displayEmail, displayPhone],
|
|
389
397
|
checked: item.id === client.id,
|
|
390
398
|
style: showPet ? {
|
|
391
399
|
marginBottom: 6
|
|
@@ -277,6 +277,7 @@ declare const _default: {
|
|
|
277
277
|
'pisell2.text.quotation.product.change.describe': string;
|
|
278
278
|
'pisell2.text.form.link.to.another.record.more': string;
|
|
279
279
|
'pisell2.booking.text.contact-info.title': string;
|
|
280
|
+
'pisell2.booking.text.search-placeholder': string;
|
|
280
281
|
};
|
|
281
282
|
'zh-CN': {
|
|
282
283
|
'pisell2.text.refunded-amount': string;
|
|
@@ -556,6 +557,7 @@ declare const _default: {
|
|
|
556
557
|
'pisell2.text.quotation.product.change.describe': string;
|
|
557
558
|
'pisell2.text.form.link.to.another.record.more': string;
|
|
558
559
|
'pisell2.booking.text.contact-info.title': string;
|
|
560
|
+
'pisell2.booking.text.search-placeholder': string;
|
|
559
561
|
};
|
|
560
562
|
'zh-HK': {
|
|
561
563
|
'pisell2.text.refunded-amount': string;
|
|
@@ -835,6 +837,7 @@ declare const _default: {
|
|
|
835
837
|
'pisell2.text.quotation.product.change.describe': string;
|
|
836
838
|
'pisell2.text.form.link.to.another.record.more': string;
|
|
837
839
|
'pisell2.booking.text.contact-info.title': string;
|
|
840
|
+
'pisell2.booking.text.search-placeholder': string;
|
|
838
841
|
};
|
|
839
842
|
};
|
|
840
843
|
export default _default;
|
|
@@ -322,7 +322,8 @@ export default {
|
|
|
322
322
|
'pisell2.text.quotation.product.change.describe': "Product updates available: Please refresh the following items to load the latest data.",
|
|
323
323
|
'pisell2.text.form.link.to.another.record.more': 'View More',
|
|
324
324
|
// 联系信息
|
|
325
|
-
'pisell2.booking.text.contact-info.title': 'Contact info'
|
|
325
|
+
'pisell2.booking.text.contact-info.title': 'Contact info',
|
|
326
|
+
'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts'
|
|
326
327
|
},
|
|
327
328
|
'zh-CN': {
|
|
328
329
|
'pisell2.text.refunded-amount': '已退金额',
|
|
@@ -651,7 +652,8 @@ export default {
|
|
|
651
652
|
'pisell2.text.quotation.product.change.describe': "以下商品信息已更新,请重新编辑相关商品以同步最新数据。",
|
|
652
653
|
'pisell2.text.form.link.to.another.record.more': '查看更多',
|
|
653
654
|
// 联系信息
|
|
654
|
-
'pisell2.booking.text.contact-info.title': '联系信息'
|
|
655
|
+
'pisell2.booking.text.contact-info.title': '联系信息',
|
|
656
|
+
'pisell2.booking.text.search-placeholder': '搜索客户/联系信息'
|
|
655
657
|
},
|
|
656
658
|
'zh-HK': {
|
|
657
659
|
'pisell2.text.refunded-amount': '已退金額',
|
|
@@ -980,6 +982,7 @@ export default {
|
|
|
980
982
|
'pisell2.text.quotation.product.change.describe': "以下商品信息已更新,请重新编辑相关商品以同步最新数据。",
|
|
981
983
|
'pisell2.text.form.link.to.another.record.more': '查看更多',
|
|
982
984
|
// 联系信息
|
|
983
|
-
'pisell2.booking.text.contact-info.title': '聯繫信息'
|
|
985
|
+
'pisell2.booking.text.contact-info.title': '聯繫信息',
|
|
986
|
+
'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息'
|
|
984
987
|
}
|
|
985
988
|
};
|
|
@@ -97,6 +97,7 @@ var ContactInfoModalContent = function ContactInfoModalContent(props) {
|
|
|
97
97
|
onSave({
|
|
98
98
|
first_name: (_values === null || _values === void 0 ? void 0 : _values.first_name) || '',
|
|
99
99
|
last_name: (_values === null || _values === void 0 ? void 0 : _values.last_name) || '',
|
|
100
|
+
display_name: _values !== null && _values !== void 0 && _values.first_name || _values !== null && _values !== void 0 && _values.last_name ? "".concat((_values === null || _values === void 0 ? void 0 : _values.first_name) || '', " ").concat((_values === null || _values === void 0 ? void 0 : _values.last_name) || '') : '',
|
|
100
101
|
phone: {
|
|
101
102
|
phone: (_values === null || _values === void 0 || (_values$phone = _values.phone) === null || _values$phone === void 0 ? void 0 : _values$phone.phone) || '',
|
|
102
103
|
country_calling_code: (_values === null || _values === void 0 || (_values$phone2 = _values.phone) === null || _values$phone2 === void 0 ? void 0 : _values$phone2.countryCallingCode) || '',
|
|
@@ -228,6 +228,11 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
|
|
|
228
228
|
country_code: ((_g = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _g.countryCode) || ""
|
|
229
229
|
};
|
|
230
230
|
contacts_info.phone = newPhone;
|
|
231
|
+
if ((contacts_info == null ? void 0 : contacts_info.first_name) || (contacts_info == null ? void 0 : contacts_info.last_name)) {
|
|
232
|
+
contacts_info.display_name = `${(contacts_info == null ? void 0 : contacts_info.first_name) || ""} ${(contacts_info == null ? void 0 : contacts_info.last_name) || ""}`;
|
|
233
|
+
} else {
|
|
234
|
+
contacts_info.display_name = "";
|
|
235
|
+
}
|
|
231
236
|
console.log("contacts_info", contacts_info);
|
|
232
237
|
}
|
|
233
238
|
} catch (error) {
|
|
@@ -293,7 +293,7 @@ var CustomSelect = (props, ref) => {
|
|
|
293
293
|
ref: searchRef,
|
|
294
294
|
prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
|
|
295
295
|
style: { marginTop: 16, height: 44 },
|
|
296
|
-
placeholder: import_utils2.locales.getText("pisell2.text.search"),
|
|
296
|
+
placeholder: import_utils2.locales.getText("pisell2.booking.text.search-placeholder"),
|
|
297
297
|
value: search,
|
|
298
298
|
allowClear: true,
|
|
299
299
|
onChange: (e) => {
|
|
@@ -39,31 +39,49 @@ var import_useSendModal = __toESM(require("./sendModal/useSendModal"));
|
|
|
39
39
|
var import_sendModal = __toESM(require("./sendModal"));
|
|
40
40
|
var import_utils = require("@pisell/utils");
|
|
41
41
|
var Footer = ({ state, reload }) => {
|
|
42
|
-
var _a, _b, _c, _d;
|
|
42
|
+
var _a, _b, _c, _d, _e;
|
|
43
43
|
const { open, setOpen, handleOpen, handleValuesChange, handleOk } = (0, import_useSendModal.default)(state == null ? void 0 : state.bookingId);
|
|
44
44
|
const handleReload = async () => {
|
|
45
45
|
await reload();
|
|
46
46
|
import_materials.message.success(import_utils.locales.getText("pisell2.text.send-form-reminder-refresh"));
|
|
47
47
|
};
|
|
48
48
|
const defaultValues = (0, import_react.useMemo)(() => {
|
|
49
|
-
var _a2, _b2
|
|
49
|
+
var _a2, _b2;
|
|
50
|
+
const { email: contactsEmail, phone: contactsPhone } = ((_a2 = state.contacts_info) == null ? void 0 : _a2.value) || {};
|
|
51
|
+
const {
|
|
52
|
+
email: clientEmail,
|
|
53
|
+
phone: clientPhone,
|
|
54
|
+
country_calling_code: clientCode
|
|
55
|
+
} = ((_b2 = state.client) == null ? void 0 : _b2.value) || {};
|
|
56
|
+
let email = contactsEmail || clientEmail;
|
|
57
|
+
let phone = (contactsPhone == null ? void 0 : contactsPhone.phone) || clientPhone;
|
|
58
|
+
let code = (contactsPhone == null ? void 0 : contactsPhone.country_calling_code) || clientCode || "+61";
|
|
59
|
+
if (!code.startsWith("+")) {
|
|
60
|
+
code = `+${code}`;
|
|
61
|
+
}
|
|
50
62
|
return {
|
|
51
|
-
sendSms: !!
|
|
52
|
-
sendEmail: !!
|
|
53
|
-
email
|
|
63
|
+
sendSms: !!phone,
|
|
64
|
+
sendEmail: !!email,
|
|
65
|
+
email,
|
|
54
66
|
phone: {
|
|
55
|
-
code
|
|
56
|
-
phone
|
|
67
|
+
code,
|
|
68
|
+
phone
|
|
57
69
|
}
|
|
58
70
|
};
|
|
59
|
-
}, [(_a = state.client) == null ? void 0 : _a.value]);
|
|
60
|
-
if (!state.bookingId || !((
|
|
71
|
+
}, [(_a = state.client) == null ? void 0 : _a.value, (_b = state.contacts_info) == null ? void 0 : _b.value]);
|
|
72
|
+
if (!state.bookingId || !((_c = state == null ? void 0 : state.form) == null ? void 0 : _c.forms.length)) {
|
|
61
73
|
return null;
|
|
62
74
|
}
|
|
63
|
-
return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(
|
|
75
|
+
return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(
|
|
76
|
+
import_materials.Tooltip,
|
|
77
|
+
{
|
|
78
|
+
title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip")
|
|
79
|
+
},
|
|
80
|
+
/* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })
|
|
81
|
+
), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), open && /* @__PURE__ */ import_react.default.createElement(
|
|
64
82
|
import_sendModal.default,
|
|
65
83
|
{
|
|
66
|
-
refreshKey: (
|
|
84
|
+
refreshKey: (_e = (_d = state.client) == null ? void 0 : _d.value) == null ? void 0 : _e.id,
|
|
67
85
|
open,
|
|
68
86
|
onCancel: () => setOpen(false),
|
|
69
87
|
onOk: handleOk,
|
|
@@ -91,8 +91,13 @@ var Client = () => {
|
|
|
91
91
|
}
|
|
92
92
|
_setLoading(true);
|
|
93
93
|
const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClientsEs;
|
|
94
|
+
const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
|
|
95
|
+
if (!withKey.includes("contactsInfo")) {
|
|
96
|
+
withKey.push("contactsInfo");
|
|
97
|
+
}
|
|
94
98
|
const data = await api({
|
|
95
99
|
...resetParams,
|
|
100
|
+
with: withKey,
|
|
96
101
|
...!state.isFranchisee ? { _config: { abort: true } } : {}
|
|
97
102
|
});
|
|
98
103
|
const list = ((data == null ? void 0 : data.list) || []).map((d) => {
|
|
@@ -322,6 +327,14 @@ var Client = () => {
|
|
|
322
327
|
closeCallback: () => {
|
|
323
328
|
},
|
|
324
329
|
optionRender: (item) => {
|
|
330
|
+
var _a2, _b2, _c2, _d2, _e2;
|
|
331
|
+
console.log("render_optionRender", item);
|
|
332
|
+
let displayEmail = item == null ? void 0 : item.email;
|
|
333
|
+
let displayPhone = item == null ? void 0 : item.phone;
|
|
334
|
+
if (!displayEmail && !displayPhone) {
|
|
335
|
+
displayEmail = (_b2 = (_a2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a2.value) == null ? void 0 : _b2.email;
|
|
336
|
+
displayPhone = (_e2 = (_d2 = (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value) == null ? void 0 : _d2.phone) == null ? void 0 : _e2.phone;
|
|
337
|
+
}
|
|
325
338
|
return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
|
|
326
339
|
import_antd.Avatar,
|
|
327
340
|
{
|
|
@@ -329,7 +342,7 @@ var Client = () => {
|
|
|
329
342
|
src: import_utils.image.ali(item.cover, 100) || void 0,
|
|
330
343
|
icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
|
|
331
344
|
}
|
|
332
|
-
), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" },
|
|
345
|
+
), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, displayEmail ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayEmail) : null, displayPhone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayPhone) : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-waiver", title: (0, import_utils3.getWaiverTitle)(item.waiver_form) }, (item.waiver_form || []).map((item2) => {
|
|
333
346
|
return /* @__PURE__ */ import_react.default.createElement("span", null, item2.form_title, ":", item2.is_filled ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-filled" }, import_utils.locales.getText("pisell2.text.filled")) : /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-not-filled" }, import_utils.locales.getText("pisell2.text.not-filled")), "; ");
|
|
334
347
|
}))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
|
|
335
348
|
},
|
|
@@ -91,11 +91,16 @@ var useClientFn = (_params) => {
|
|
|
91
91
|
}
|
|
92
92
|
_setLoading(true);
|
|
93
93
|
const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
|
|
94
|
+
const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
|
|
95
|
+
if (!withKey.includes("contactsInfo")) {
|
|
96
|
+
withKey.push("contactsInfo");
|
|
97
|
+
}
|
|
94
98
|
const data = await api({
|
|
95
99
|
...resetParams,
|
|
96
100
|
...resetParams.search ? { num: 10 } : {},
|
|
97
101
|
...state.isFranchisee ? { franchisee_customer_ids: customer_ids } : { customer_ids },
|
|
98
|
-
...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {}
|
|
102
|
+
...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {},
|
|
103
|
+
with: withKey
|
|
99
104
|
});
|
|
100
105
|
const list = ((data == null ? void 0 : data.list) || []).map((d) => {
|
|
101
106
|
var _a3;
|
|
@@ -279,6 +279,7 @@ var SelectDrawer = (props, ref) => {
|
|
|
279
279
|
}
|
|
280
280
|
closeDrawer();
|
|
281
281
|
};
|
|
282
|
+
console.log("options7777", options);
|
|
282
283
|
return /* @__PURE__ */ import_react.default.createElement(
|
|
283
284
|
import_drawer.default,
|
|
284
285
|
{
|
|
@@ -292,7 +293,7 @@ var SelectDrawer = (props, ref) => {
|
|
|
292
293
|
ref: searchRef,
|
|
293
294
|
prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
|
|
294
295
|
style: { margin: "16px 0", height: 44 },
|
|
295
|
-
placeholder: import_utils.locales.getText("pisell2.text.search"),
|
|
296
|
+
placeholder: import_utils.locales.getText("pisell2.booking.text.search-placeholder"),
|
|
296
297
|
value: search,
|
|
297
298
|
allowClear: true,
|
|
298
299
|
onChange: (e) => {
|
|
@@ -335,7 +336,13 @@ var SelectDrawer = (props, ref) => {
|
|
|
335
336
|
}
|
|
336
337
|
}
|
|
337
338
|
) : null), /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: !!loading, delay: 500 }, !!options.length ? options.map((item) => {
|
|
338
|
-
var _a;
|
|
339
|
+
var _a, _b, _c, _d, _e, _f;
|
|
340
|
+
let displayEmail = item == null ? void 0 : item.email;
|
|
341
|
+
let displayPhone = item == null ? void 0 : item.phone;
|
|
342
|
+
if (!displayEmail && !displayPhone) {
|
|
343
|
+
displayEmail = (_b = (_a = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a.value) == null ? void 0 : _b.email;
|
|
344
|
+
displayPhone = (_e = (_d = (_c = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c.value) == null ? void 0 : _d.phone) == null ? void 0 : _e.phone;
|
|
345
|
+
}
|
|
339
346
|
return /* @__PURE__ */ import_react.default.createElement(
|
|
340
347
|
"div",
|
|
341
348
|
{
|
|
@@ -348,7 +355,7 @@ var SelectDrawer = (props, ref) => {
|
|
|
348
355
|
onClick: () => handleClientClick(item),
|
|
349
356
|
cover: item.cover,
|
|
350
357
|
title: getNickname(item),
|
|
351
|
-
desc: [
|
|
358
|
+
desc: [displayEmail, displayPhone],
|
|
352
359
|
checked: item.id === client.id,
|
|
353
360
|
style: showPet ? { marginBottom: 6 } : {},
|
|
354
361
|
loading: franchiseeLoading === item.id,
|
|
@@ -396,7 +403,7 @@ var SelectDrawer = (props, ref) => {
|
|
|
396
403
|
},
|
|
397
404
|
style: { padding: 16 }
|
|
398
405
|
},
|
|
399
|
-
/* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((
|
|
406
|
+
/* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_f = holder.form) == null ? void 0 : _f.title) || "-"}`))
|
|
400
407
|
), /* @__PURE__ */ import_react.default.createElement("div", null))
|
|
401
408
|
);
|
|
402
409
|
}) : /* @__PURE__ */ import_react.default.createElement(import_antd.Empty, { image: import_antd.Empty.PRESENTED_IMAGE_SIMPLE }), /* @__PURE__ */ import_react.default.createElement("div", null, loadMore)))
|