@pisell/private-materials 6.11.185 → 6.11.187

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/es/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/es/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/es/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SelectDate: (props: any) => JSX.Element | null;
 export default SelectDate;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

package/es/components/appointmentBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;

package/es/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

package/es/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: () => JSX.Element;
 export default CartItem;

package/es/components/eventBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const EventBooking: () => JSX.Element;
 export default EventBooking;

package/es/plus/clinetSearch/Add/index.js

@@ -26,9 +26,11 @@ import "./index.less";
 import CompensatedPisellContainer from "../../../pro/compensatedPisellContainer";
 import { withResponsive } from "../../../responsive";
 var AddClient = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _context$appHelper2;
   var context = useEngineContext();
-  request.setRequest((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.request);
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    sendWarningLog = _ref.sendWarningLog;
+  request.setRequest((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.request);
   var onChange = props.onChange,
     phone = props.phone,
     containerProps = props.containerProps,
@@ -55,6 +57,22 @@ var AddClient = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var _addClient = useRequest(addCustomer, {
     manual: true,
+    onBefore: function onBefore(params) {
+      try {
+        sendWarningLog === null || sendWarningLog === void 0 || sendWarningLog({
+          title: 'Add Client',
+          content: [{
+            key: 'time',
+            value: Date.now()
+          }, {
+            key: 'data',
+            value: JSON.stringify(params)
+          }]
+        });
+      } catch (error) {
+        console.error(error);
+      }
+    },
     onSuccess: function onSuccess(res, param) {
       var _param$;
       onChange(_objectSpread(_objectSpread({}, (_param$ = param[0]) === null || _param$ === void 0 ? void 0 : _param$.customer), {}, {

package/es/plus/pisellReservation/floorMap/useReservationFloorPlan.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { FloorMapViewConfig } from '@pisell/materials';
 export declare function useReservationFloorPlan(options: {
     resolvedFloorPlanId: number | null;

package/es/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.d.ts

@@ -22,7 +22,7 @@ export declare function resolveFloorRoomCardContactTiers(b: Record<string, unkno
 /**
  * 平面图 / 详情弹窗 / 列表联系人：与 Pisell Reservation 统一规则。
  * - **holder** / **contacts_info** 与 `customer_id` 无关；仅 **customer** 档案层在 id 为 0、1 时不采用。
- * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（`customer_name` / `order.customer`（`display_name` → `nickname` → `first_name`+`last_name`）/ `order.phone`）。
+ * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（姓名：`customer_name` → `customer.display_name` → `nickname` → `first_name`+`last_name`；电话：`order.phone` → `customer.phone` → `customer.mobile`；二者独立短路后再合并）。
  */
 export declare function resolveFloorRoomCardHolder(b: Record<string, unknown>): FloorRoomCardHolder | undefined;
 /** 单条 floorMapSourceBookings → 与平面图 RoomCard 一致的 booking 模型 */

package/es/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.js

@@ -186,37 +186,48 @@ function holderFromBookingHolderField(b) {
   return null;
 }
 
-/** customer 层级：与 {@link resolveFloorRoomCardHolder} 中 branch 一致 */
-function customerTierContact(ord) {
+/**
+ * customer 层姓名：自上而下短路。
+ * `customer_name` → `customer.display_name` → `nickname` → `first_name` + `last_name`
+ */
+function resolveCustomerTierName(ord) {
   var cn = typeof ord.customer_name === 'string' ? ord.customer_name.trim() : '';
-  var topPhone = typeof ord.phone === 'string' && /\d/.test(ord.phone) ? ord.phone : undefined;
-  if (cn || topPhone) {
-    return _objectSpread({
-      name: cn
-    }, topPhone ? {
-      phone: topPhone
-    } : {});
-  }
+  if (cn) return cn;
   var cust = ord.customer;
-  if (cust && _typeof(cust) === 'object') {
-    var _cust$phone;
-    var fn = typeof cust.first_name === 'string' ? cust.first_name.trim() : '';
-    var ln = typeof cust.last_name === 'string' ? cust.last_name.trim() : '';
-    var firstLast = [fn, ln].filter(Boolean).join(' ').trim();
-    var displayName = typeof cust.display_name === 'string' ? cust.display_name.trim() : '';
-    var nick = typeof cust.nickname === 'string' ? cust.nickname.trim() : '';
-    var custName = displayName || nick || firstLast || '';
-    var custPhoneRaw = (_cust$phone = cust.phone) !== null && _cust$phone !== void 0 ? _cust$phone : cust.mobile;
-    var custPhone = typeof custPhoneRaw === 'string' && /\d/.test(custPhoneRaw) ? custPhoneRaw : undefined;
-    if (custName || custPhone) {
-      return _objectSpread({
-        name: custName
-      }, custPhone ? {
-        phone: custPhone
-      } : {});
-    }
-  }
-  return null;
+  if (!cust || _typeof(cust) !== 'object') return '';
+  var displayName = typeof cust.display_name === 'string' ? cust.display_name.trim() : '';
+  if (displayName) return displayName;
+  var nick = typeof cust.nickname === 'string' ? cust.nickname.trim() : '';
+  if (nick) return nick;
+  var fn = typeof cust.first_name === 'string' ? cust.first_name.trim() : '';
+  var ln = typeof cust.last_name === 'string' ? cust.last_name.trim() : '';
+  return [fn, ln].filter(Boolean).join(' ').trim();
+}
+
+/**
+ * customer 层电话：自上而下短路。
+ * `order.phone` → `customer.phone` → `customer.mobile`
+ */
+function resolveCustomerTierPhone(ord) {
+  var _cust$phone;
+  var top = typeof ord.phone === 'string' && /\d/.test(ord.phone) ? ord.phone : undefined;
+  if (top) return top;
+  var cust = ord.customer;
+  if (!cust || _typeof(cust) !== 'object') return undefined;
+  var raw = (_cust$phone = cust.phone) !== null && _cust$phone !== void 0 ? _cust$phone : cust.mobile;
+  return typeof raw === 'string' && /\d/.test(raw) ? raw : undefined;
+}
+
+/** customer 层级：姓名与电话各自优先级解析后再合并；任一有值即返回 */
+function customerTierContact(ord) {
+  var name = resolveCustomerTierName(ord);
+  var phone = resolveCustomerTierPhone(ord);
+  if (!name && !phone) return null;
+  return _objectSpread({
+    name: name
+  }, phone ? {
+    phone: phone
+  } : {});
 }
 
 /** `order.contacts_info`：first_name / last_name / phone.phone */
@@ -281,7 +292,7 @@ export function resolveFloorRoomCardContactTiers(b) {
 /**
  * 平面图 / 详情弹窗 / 列表联系人：与 Pisell Reservation 统一规则。
  * - **holder** / **contacts_info** 与 `customer_id` 无关；仅 **customer** 档案层在 id 为 0、1 时不采用。
- * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（`customer_name` / `order.customer`（`display_name` → `nickname` → `first_name`+`last_name`）/ `order.phone`）。
+ * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（姓名：`customer_name` → `customer.display_name` → `nickname` → `first_name`+`last_name`；电话：`order.phone` → `customer.phone` → `customer.mobile`；二者独立短路后再合并）。
  */
 export function resolveFloorRoomCardHolder(b) {
   var ord = b.order;

package/es/plus/pisellReservation/floorRoomCard/views/RoomCardIcons.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const IconClock: () => JSX.Element;
 export declare const IconUsers: () => JSX.Element;
 export declare const IconWarn: () => JSX.Element;

package/es/plus/pisellReservation/hooks/useReservationScheduleDebounced.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 /**
  * @returns `schedule` 绑定日程带 UI；`debouncedSchedule` 绑定 sales / patch / 外部 onSearch。

package/es/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/lib/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/lib/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SelectDate: (props: any) => JSX.Element | null;
 export default SelectDate;

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

package/lib/components/appointmentBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: () => JSX.Element;
 export default CartItem;

package/lib/components/eventBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const EventBooking: () => JSX.Element;
 export default EventBooking;

package/lib/plus/clinetSearch/Add/index.js

@@ -45,9 +45,12 @@ var import_index = require("./index.less");
 var import_compensatedPisellContainer = __toESM(require("../../../pro/compensatedPisellContainer"));
 var import_responsive = require("../../../responsive");
 var AddClient = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b;
+  var _a, _b, _c;
   const context = (0, import_useEngineContext.default)();
-  import_utils2.request.setRequest((_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.request);
+  const {
+    sendWarningLog
+  } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  import_utils2.request.setRequest((_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.request);
   const { onChange, phone, containerProps, variant } = props;
   const isPhoneVariant = variant === "phone";
   const [form] = import_antd.Form.useForm();
@@ -62,6 +65,19 @@ var AddClient = (0, import_react.forwardRef)((props, ref) => {
   }));
   const _addClient = (0, import_ahooks.useRequest)(import_serve.addCustomer, {
     manual: true,
+    onBefore: (params) => {
+      try {
+        sendWarningLog == null ? void 0 : sendWarningLog({
+          title: "Add Client",
+          content: [
+            { key: "time", value: Date.now() },
+            { key: "data", value: JSON.stringify(params) }
+          ]
+        });
+      } catch (error) {
+        console.error(error);
+      }
+    },
     onSuccess: (res, param) => {
       var _a2;
       onChange({ ...(_a2 = param[0]) == null ? void 0 : _a2.customer, id: res.customer_id }, useIsChecked);

package/lib/plus/pisellReservation/floorMap/useReservationFloorPlan.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { FloorMapViewConfig } from '@pisell/materials';
 export declare function useReservationFloorPlan(options: {
     resolvedFloorPlanId: number | null;

package/lib/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.d.ts

@@ -22,7 +22,7 @@ export declare function resolveFloorRoomCardContactTiers(b: Record<string, unkno
 /**
  * 平面图 / 详情弹窗 / 列表联系人：与 Pisell Reservation 统一规则。
  * - **holder** / **contacts_info** 与 `customer_id` 无关；仅 **customer** 档案层在 id 为 0、1 时不采用。
- * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（`customer_name` / `order.customer`（`display_name` → `nickname` → `first_name`+`last_name`）/ `order.phone`）。
+ * - 顺序：**holder**（`booking.holder` → `holder_data`）→ **contact**（`order.contacts_info`）→ **customer**（姓名：`customer_name` → `customer.display_name` → `nickname` → `first_name`+`last_name`；电话：`order.phone` → `customer.phone` → `customer.mobile`；二者独立短路后再合并）。
  */
 export declare function resolveFloorRoomCardHolder(b: Record<string, unknown>): FloorRoomCardHolder | undefined;
 /** 单条 floorMapSourceBookings → 与平面图 RoomCard 一致的 booking 模型 */

package/lib/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.js

@@ -174,33 +174,35 @@ function holderFromBookingHolderField(b) {
   }
   return null;
 }
-function customerTierContact(ord) {
+function resolveCustomerTierName(ord) {
   const cn = typeof ord.customer_name === "string" ? ord.customer_name.trim() : "";
-  const topPhone = typeof ord.phone === "string" && /\d/.test(ord.phone) ? ord.phone : void 0;
-  if (cn || topPhone) {
-    return {
-      name: cn,
-      ...topPhone ? { phone: topPhone } : {}
-    };
-  }
+  if (cn) return cn;
   const cust = ord.customer;
-  if (cust && typeof cust === "object") {
-    const fn = typeof cust.first_name === "string" ? cust.first_name.trim() : "";
-    const ln = typeof cust.last_name === "string" ? cust.last_name.trim() : "";
-    const firstLast = [fn, ln].filter(Boolean).join(" ").trim();
-    const displayName = typeof cust.display_name === "string" ? cust.display_name.trim() : "";
-    const nick = typeof cust.nickname === "string" ? cust.nickname.trim() : "";
-    const custName = displayName || nick || firstLast || "";
-    const custPhoneRaw = cust.phone ?? cust.mobile;
-    const custPhone = typeof custPhoneRaw === "string" && /\d/.test(custPhoneRaw) ? custPhoneRaw : void 0;
-    if (custName || custPhone) {
-      return {
-        name: custName,
-        ...custPhone ? { phone: custPhone } : {}
-      };
-    }
-  }
-  return null;
+  if (!cust || typeof cust !== "object") return "";
+  const displayName = typeof cust.display_name === "string" ? cust.display_name.trim() : "";
+  if (displayName) return displayName;
+  const nick = typeof cust.nickname === "string" ? cust.nickname.trim() : "";
+  if (nick) return nick;
+  const fn = typeof cust.first_name === "string" ? cust.first_name.trim() : "";
+  const ln = typeof cust.last_name === "string" ? cust.last_name.trim() : "";
+  return [fn, ln].filter(Boolean).join(" ").trim();
+}
+function resolveCustomerTierPhone(ord) {
+  const top = typeof ord.phone === "string" && /\d/.test(ord.phone) ? ord.phone : void 0;
+  if (top) return top;
+  const cust = ord.customer;
+  if (!cust || typeof cust !== "object") return void 0;
+  const raw = cust.phone ?? cust.mobile;
+  return typeof raw === "string" && /\d/.test(raw) ? raw : void 0;
+}
+function customerTierContact(ord) {
+  const name = resolveCustomerTierName(ord);
+  const phone = resolveCustomerTierPhone(ord);
+  if (!name && !phone) return null;
+  return {
+    name,
+    ...phone ? { phone } : {}
+  };
 }
 function contactsInfoContact(order) {
   const ci = order.contacts_info;

package/lib/plus/pisellReservation/floorRoomCard/views/RoomCardIcons.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const IconClock: () => JSX.Element;
 export declare const IconUsers: () => JSX.Element;
 export declare const IconWarn: () => JSX.Element;

package/lib/plus/pisellReservation/hooks/useReservationScheduleDebounced.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 /**
  * @returns `schedule` 绑定日程带 UI；`debouncedSchedule` 绑定 sales / patch / 外部 onSearch。

package/lib/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.185",
+  "version": "6.11.187",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",