@pisell/private-materials 3.3.91 → 3.3.92

package/lib/components/booking/info2/service/editService/Resources/index.less

@@ -15,6 +15,12 @@
     .like-resource {}
   }
 
+  .resource-col-like-wrap-disabled,
+  .like-icon-disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
   .resource-col-select {
     flex: 1;
   }

package/lib/components/booking/info2/service/editService/ResourcesV2/MaxLengthSelect/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { SelectProps } from 'antd';
+interface MaxLengthSelectProps<T> extends SelectProps<T> {
+    maxLength: number;
+}
+declare const _default: import("react").ForwardRefExoticComponent<Partial<MaxLengthSelectProps<any>> & import("react").RefAttributes<unknown>>;
+export default _default;

package/lib/components/booking/info2/service/editService/ResourcesV2/MaxLengthSelect/index.js

@@ -0,0 +1,53 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/service/editService/ResourcesV2/MaxLengthSelect/index.tsx
+var MaxLengthSelect_exports = {};
+__export(MaxLengthSelect_exports, {
+  default: () => MaxLengthSelect_default
+});
+module.exports = __toCommonJS(MaxLengthSelect_exports);
+var import_react = require("react");
+var import_antd = require("antd");
+var MaxLengthSelect = (props, ref) => {
+  (0, import_react.useImperativeHandle)(ref, () => {
+    return {
+      onChange: handleChange
+    };
+  });
+  const handleChange = (e, _option) => {
+    if (props.onChange) {
+      if ((props.mode === "multiple" || props.mode === "tags") && props.maxLength) {
+        if (props.value && props.value.length >= props.maxLength && e.length > props.value.length) {
+          return;
+        }
+      }
+      props.onChange(e, _option);
+    }
+  };
+  return /* @__PURE__ */ React.createElement(
+    import_antd.Select,
+    {
+      ...props,
+      onChange: handleChange,
+      popupMatchSelectWidth: false
+    },
+    props.children
+  );
+};
+var MaxLengthSelect_default = (0, import_react.forwardRef)(MaxLengthSelect);

package/lib/components/booking/info2/service/editService/ResourcesV2/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import './index.less';
+interface IResourcesProps {
+    [key: string]: any;
+    /** 展示资源的变动情况 */
+    originCacheItem: any;
+    originValue: any;
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<IResourcesProps, "ref"> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/components/booking/info2/service/editService/ResourcesV2/index.js

@@ -0,0 +1,311 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/service/editService/ResourcesV2/index.tsx
+var ResourcesV2_exports = {};
+__export(ResourcesV2_exports, {
+  default: () => ResourcesV2_default
+});
+module.exports = __toCommonJS(ResourcesV2_exports);
+var import_react = __toESM(require("react"));
+var import_classnames = __toESM(require("classnames"));
+var import_antd = require("antd");
+var import_materials = require("@pisell/materials");
+var import_MaxLengthSelect = __toESM(require("./MaxLengthSelect"));
+var import_like = __toESM(require("../../../../info/service/like"));
+var import_index = require("./index.less");
+var import_utils = require("@pisell/utils");
+var import_utilsByBooking = require("../../../utilsByBooking");
+var import_lodash = require("lodash");
+var import_utils2 = require("../utils");
+var import_ahooks = require("ahooks");
+var import_icons = require("@ant-design/icons");
+var Resources = ({
+  state,
+  cacheItem,
+  originCacheItem,
+  getCurrentCacheItem,
+  onChange,
+  value,
+  originValue,
+  config = {
+    // 是否显示自动分配
+    autoAllocation: true,
+    // 是否显示资源错误图标
+    resourceErrorIcon: true,
+    disabled: false,
+    size: "large"
+  }
+}, ref) => {
+  var _a, _b, _c;
+  const [showError, setShowError] = (0, import_react.useState)(false);
+  const update = (0, import_ahooks.useUpdate)();
+  const data = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ((_a2 = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a2.resources) || [];
+  }, [(_a = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a.resources]);
+  const originData = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ((_a2 = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a2.resources) || [];
+  }, [(_b = originCacheItem == null ? void 0 : originCacheItem._data) == null ? void 0 : _b.resource]);
+  const resourceMaps = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ((_a2 = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a2.resourceMaps) || [];
+  }, [(_c = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _c.resourceMaps]);
+  const defaultValue = (0, import_react.useMemo)(() => {
+    return data.reduce((pre, cur2) => {
+      pre[cur2.form_id] = [];
+      return pre;
+    }, {});
+  }, [data]);
+  const _value = (0, import_react.useMemo)(() => {
+    return value || defaultValue;
+  }, [value, defaultValue]);
+  const handleCheckAutoAllocation = (id, checked) => {
+    (0, import_utils2.setAutoAllocationStorage)({ [id]: checked });
+    update();
+  };
+  const _onChange = (val, form_id, key) => {
+    let _val = { ..._value };
+    let maps = _val[form_id] ? _val[form_id].reduce((pre, cur2) => {
+      pre[cur2.relation_id] = cur2;
+      return pre;
+    }, {}) : {};
+    _val[form_id] = val.map((d) => {
+      var _a2, _b2, _c2, _d2, _e, _f, _g, _h;
+      let _d = maps[d];
+      if (_d) {
+        if (key === "like_status") {
+          d[key].like_status = val;
+        }
+      }
+      const currentForm = (resourceMaps == null ? void 0 : resourceMaps[form_id]) || {};
+      return (
+        // maps[d] 为真时, 说明是之前已选择, 否则为新增的值,补充数据
+        maps[d] || {
+          relation_type: ((_b2 = (_a2 = currentForm.renderListMaps[d]) == null ? void 0 : _a2.usable) == null ? void 0 : _b2.relation_type) || "form",
+          form_id,
+          relation_id: d,
+          like_status: "common",
+          children: (_d2 = (_c2 = currentForm.renderListMaps) == null ? void 0 : _c2[d]) == null ? void 0 : _d2.children,
+          // 新添加的数据补充错误信息
+          errors: (0, import_utilsByBooking.getErrorList)(
+            (_e = currentForm.renderListMaps) == null ? void 0 : _e[d],
+            getCurrentCacheItem()
+          ),
+          metadata: {
+            ...(_g = (_f = currentForm.renderListMaps) == null ? void 0 : _f[d]) == null ? void 0 : _g.metadata,
+            form_name: currentForm.title,
+            resource_name: (_h = currentForm.renderListMaps[d]) == null ? void 0 : _h.main_field
+          }
+        }
+      );
+    });
+    setShowError(false);
+    onChange == null ? void 0 : onChange(_val);
+  };
+  const setLikeStatus = (val, form_id, key) => {
+    var _a2;
+    let _val = { ..._value };
+    if ((_a2 = _val == null ? void 0 : _val[form_id]) == null ? void 0 : _a2[0]) {
+      _val[form_id][0][key] = val;
+      onChange == null ? void 0 : onChange(_val);
+    }
+  };
+  const renderOptions = (0, import_react.useCallback)(
+    (array, value2 = "value", label = "label", type) => {
+      return array.map((d) => {
+        let props = {};
+        if (type === "resource") {
+          props.labelText = d.labelText;
+        }
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Select.Option,
+          {
+            value: d[value2],
+            key: d[value2],
+            ...props,
+            relation_type: d.relation_type
+          },
+          d[label]
+        );
+      });
+    },
+    [config == null ? void 0 : config.resourceErrorIcon]
+  );
+  const check = () => {
+    var _a2;
+    for (let item of data) {
+      let _length = (_a2 = _value[item.form_id]) == null ? void 0 : _a2.length;
+      if (item.select_type.min > _length) {
+        setShowError(true);
+        return false;
+      }
+    }
+    return true;
+  };
+  (0, import_react.useImperativeHandle)(ref, () => {
+    return {
+      check
+    };
+  });
+  const getIsAutoAllocation = (id) => {
+    return (0, import_utils2.getAutoAllocationStorage)(id);
+  };
+  const renderItem = (item, isOrigin) => {
+    var _a2;
+    if (!item) return null;
+    const disabled = isOrigin || (config == null ? void 0 : config.disabled);
+    const cur2 = isOrigin ? originValue[item.form_id] : _value[item.form_id];
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { flex: "1 0" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-v2 resource-col" }, item.select_type.type === "multiple" ? null : /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        className: (0, import_classnames.default)(
+          "resource-col-like-wrap",
+          {
+            "resource-col-like-wrap-disabled": disabled
+          },
+          (config == null ? void 0 : config.size) || "large"
+        ),
+        size: config == null ? void 0 : config.size,
+        onClick: () => {
+          var _a3;
+          if (disabled) {
+            return;
+          }
+          setLikeStatus(
+            ((_a3 = cur2 == null ? void 0 : cur2[0]) == null ? void 0 : _a3.like_status) === "like" ? "common" : "like",
+            item.form_id,
+            "like_status"
+          );
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_like.default,
+        {
+          status: (_a2 = cur2 == null ? void 0 : cur2[0]) == null ? void 0 : _a2.like_status,
+          className: `${disabled ? "like-icon-disabled" : ""}`
+        }
+      )
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_MaxLengthSelect.default,
+      {
+        className: "resource-col-select",
+        size: (config == null ? void 0 : config.size) || "large",
+        maxLength: item.select_type.max,
+        mode: item.select_type.type === "multiple" ? "multiple" : void 0,
+        onChange: (e) => {
+          let val = e;
+          if (!(0, import_lodash.isArray)(e)) {
+            if (e || e === 0) {
+              val = [e];
+            }
+          }
+          _onChange(val, item.form_id, "value");
+        },
+        value: cur2 == null ? void 0 : cur2.map((d) => d.relation_id),
+        showSearch: true,
+        filterOption: (str, option) => {
+          return ((option == null ? void 0 : option.labelText) || "").toLowerCase().includes((str || "").toLowerCase());
+        },
+        disabled
+      },
+      renderOptions(
+        item.renderList,
+        "id",
+        (config == null ? void 0 : config.resourceErrorIcon) ? "label" : "labelText",
+        "resource"
+      )
+    ), (config == null ? void 0 : config.autoAllocation) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Checkbox,
+      {
+        checked: getIsAutoAllocation(item.form_id),
+        onChange: (e) => {
+          handleCheckAutoAllocation(item.form_id, e.target.checked);
+        }
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Tooltip,
+      {
+        title: import_utils.locales.getText(
+          "page.booking.text.resource.check-auto-allocation-tip"
+        )
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)
+    )) : null)));
+  };
+  const renderErrors = (item) => {
+    const cur2 = _value[item.form_id];
+    const errors = (cur2 || []).reduce((pre, d) => {
+      return pre.concat((d == null ? void 0 : d.errors) || []);
+    }, []);
+    return state.renderType !== "eventBooking" && (errors || []).map((d) => {
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Alert,
+        {
+          key: d.type,
+          message: d.label,
+          type: "warning",
+          showIcon: true,
+          style: { marginBottom: 12 }
+        }
+      );
+    });
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.map((item) => {
+    const originItem = originData == null ? void 0 : originData.find(
+      (originDataItem) => originDataItem.form_id === item.form_id
+    );
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: item.form_id }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form.Item,
+      {
+        label: item.title,
+        required: true,
+        labelCol: config == null ? void 0 : config.labelCol,
+        extra: showError && item.select_type.min > (cur == null ? void 0 : cur.length) ? /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#ff4d4f" } }, import_utils.locales.getText(
+          "page.booking.text.resource.min-length-error"
+        )(item.select_type.min, item.title)) : void 0
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { gutter: [16, 16], wrap: false }, renderItem(originItem, true), !!originItem ? /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Col,
+        {
+          flex: "none",
+          style: { display: "flex", alignItems: "center" }
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Iconfont,
+          {
+            type: "pisell2-arrow-block-right",
+            style: { fontSize: 24, color: "#1b1b1b" }
+          }
+        )
+      ) : null, renderItem(item, false))
+    ), renderErrors(item));
+  }));
+};
+var ResourcesV2_default = (0, import_react.forwardRef)(Resources);

package/lib/components/booking/info2/service/editService/ResourcesV2/index.less

@@ -0,0 +1,44 @@
+.resource-col.resource-v2 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  width: 100%;
+  overflow: hidden;
+
+  .resource-col-like-wrap {
+    width: 32px;
+    height: 32px;
+
+    &.large {
+      width: 40px;
+      height: 40px;
+    }
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    flex-shrink: 0;
+
+    .like-resource {
+    }
+  }
+
+  .resource-col-like-wrap-disabled,
+  .like-icon-disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .resource-col-select {
+    flex: 1;
+    overflow: hidden;
+
+    .resource-option-label-text {
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}

package/lib/components/booking/info2/utilsByBooking.js

@@ -180,6 +180,12 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
+  if (resource.unbound) {
+    list.push({
+      label: import_utils.locales.getText("pisell1.text.resource-error-message-unbound"),
+      type: "time"
+    });
+  }
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {

package/lib/components/booking/locales.d.ts

@@ -110,6 +110,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -389,6 +390,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -660,6 +662,7 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
+        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;

package/lib/components/booking/locales.js

@@ -154,6 +154,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} doesn't provide ${y}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x} isn't available between ${y} and ${z}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x} is fully booked between ${y} and ${z}, but your team member can still book appointments.`,
+    "pisell1.text.resource-error-message-unbound": "This booking product is not associated with the target resource.",
     "pisell1.text.no-addons": "No addons",
     "pisell1.text.no-resource": "No resource",
     "pisell1.text.no-payments": "No payments",
@@ -465,6 +466,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之间不提供服务，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之间已约满，但您的团队成员仍然可以预约。`,
+    "pisell1.text.resource-error-message-unbound": "该预约商品未关联目标资源。",
     "pisell2.text.flexible": "灵活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",
@@ -768,6 +770,7 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之間不提供服務，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之間已約滿，但您的團隊成員仍然可以預約。`,
+    "pisell1.text.resource-error-message-unbound": "該預約商品未關聯目標資源。",
     "pisell2.text.flexible": "靈活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",

package/lib/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/const.d.ts

@@ -5,7 +5,8 @@ export declare enum EftposEnum {
     Tyro = "tyro",
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
-    Stripe = "stripe"
+    Stripe = "stripe",
+    Linkly = "linkly"
 }
 export declare enum StatusEnum {
     Loading = "loading",
@@ -147,6 +148,8 @@ export declare enum PayStatus {
     'Success' = "200",
     /** 未生成交易记录 */
     'NoPay' = "4004",
+    /** 配对失效 */
+    'PairingFailure' = "606020",
     /** 支付失败 */
     'Unknown' = "701000",
     /** 交易请求超时 */

package/lib/components/eftposPay/const.js

@@ -35,6 +35,7 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Tyro"] = "tyro";
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
+  EftposEnum2["Linkly"] = "linkly";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -88,6 +89,7 @@ var PayRouteEnum = /* @__PURE__ */ ((PayRouteEnum2) => {
 var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["Success"] = "200";
   PayStatus2["NoPay"] = "4004";
+  PayStatus2["PairingFailure"] = "606020";
   PayStatus2["Unknown"] = "701000";
   PayStatus2["Timeout"] = "701001";
   PayStatus2["PayOtherEftposFailed"] = "701003";

package/lib/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/hooks.js

@@ -128,6 +128,7 @@ var useFail = (index) => {
         return;
       }
       const [code] = [`${res.code}`];
+      console.log("code---->>>>>>>", code);
       if (code === import_const.PayStatus.Unknown) {
         steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
           modeRef.current
@@ -168,8 +169,12 @@ var useFail = (index) => {
         if (isMark) {
           if (clientRef.current === import_const2.ClientEnum.User) {
             steps[index].status = "fail";
-            steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.timedout.title");
-            steps[index].fail = import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
+            steps[index].title = import_utils.locales.getText(
+              "page.eftpos-pay.text.timedout.title"
+            );
+            steps[index].fail = import_utils.locales.getText(
+              "page.eftpos-pay.text.transaction.eftpos.fail.other"
+            );
             steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
             dispatch((0, import_store.updateSteps)(steps));
             dispatch((0, import_store.updateComponent)("Fail"));
@@ -310,7 +315,9 @@ ${import_utils.locales.getText(
         )}
 ${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.if"
-        )(modeRef.current)}` : import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
+        )(modeRef.current)}` : import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.eftpos.fail.other"
+        );
         steps[index].status = "warn";
         steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
         dispatch((0, import_store.updateSteps)(steps));
@@ -359,7 +366,7 @@ ${import_utils.locales.getText(
         );
         return;
       }
-      if (code === import_const.PayStatus.UserConfigError) {
+      if (code === import_const.PayStatus.UserConfigError || code === import_const.PayStatus.PairingFailure) {
         steps[index].title = import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.user.config.title"
         );

package/lib/components/eftposPay/index.js

@@ -139,7 +139,7 @@ var eftposPay_default = (props) => {
   }, [mode, state]);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
-    console.log("初始化 ........11221801");
+    console.log("初始化 ........112218017777");
   }, []);
   console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   const api = (0, import_react.useMemo)(() => {

package/lib/components/eftposPay/linkly/const.d.ts

@@ -0,0 +1,23 @@
+import { State } from '../store';
+import { ModeEnum } from '../const';
+export declare const getStep: (mode?: ModeEnum) => State['steps'];
+declare const _default: (params: any) => State;
+export default _default;
+export declare enum EVisibleButtonType {
+    /** 取消按钮 */
+    CancelButton = "CancelButton",
+    /** 等待按钮 */
+    WaitButton = "WaitButton"
+}
+export declare enum LinklyActionStatus {
+    /** 空 */
+    Empty = "Empty",
+    /** 取消 */
+    Cancel = "Cancel",
+    /** 取消中 */
+    CancelWaiting = "CancelWaiting",
+    /** 签名 */
+    Signature = "Signature",
+    /** 签名等待中 */
+    SignatureWaiting = "SignatureWaiting"
+}