@pisell/private-materials 6.6.2 → 6.7.2

package/es/components/Sales/Event/Detail.js

@@ -237,8 +237,9 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
       return v.value === id;
     })) === null || _bookingOptions$filte === void 0 ? void 0 : _bookingOptions$filte[0];
     var setSelectedData = function setSelectedData(data) {
+      var _detailRef$current4;
       _setDetail({
-        introduction: _objectSpread(_objectSpread({}, introduction), {}, {
+        introduction: _objectSpread(_objectSpread({}, (detailRef === null || detailRef === void 0 || (_detailRef$current4 = detailRef.current) === null || _detailRef$current4 === void 0 ? void 0 : _detailRef$current4.introduction) || {}), {}, {
           price: data === null || data === void 0 ? void 0 : data.price,
           origin_price: data === null || data === void 0 ? void 0 : data.original_price
         }),
@@ -249,10 +250,10 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
 
     // 普通商品需要单独查询商品详情
     if ((option === null || option === void 0 || (_option$_originData = option._originData) === null || _option$_originData === void 0 ? void 0 : _option$_originData.is_eject) === 0) {
-      var _introduction$_origin;
+      var _eventRef$current;
       getProductDetailRequest.runAsync(id, {
         open_deposit: 1,
-        front_end_cache_id: (introduction === null || introduction === void 0 || (_introduction$_origin = introduction._originData) === null || _introduction$_origin === void 0 ? void 0 : _introduction$_origin.id) + '_' + id
+        front_end_cache_id: (eventRef === null || eventRef === void 0 || (_eventRef$current = eventRef.current) === null || _eventRef$current === void 0 ? void 0 : _eventRef$current.id) + '_' + id
       }).then(function (res) {
         var _res$data2;
         // 定金相关信息

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -235,7 +235,6 @@ var CartItem = function CartItem(_ref) {
       disabledEdit: isLastStep,
       isShowChangeResource: currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 || (_currentStep$step = _currentStep$step.key) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.startsWith('select-resource'),
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
-      isShowAmountFooter: true,
       isShowPackageNote: false,
       isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
       isShowHolder: isFormSubject,

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

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

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

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

package/es/components/appointmentBooking/components/Services/index.js

@@ -69,8 +69,19 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
       setProductLoading(false);
     });
   }, [isDateSelectedFirst]);
+
+  /**
+   * @description: 是否显示商品详情页面的步进器
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var isShowProductDetailStepper = useMemo(function () {
+    var _ref3 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
+      productModuleParams = _ref3.productModuleParams;
+    return productModuleParams === null || productModuleParams === void 0 ? void 0 : productModuleParams.isShowProductDetailStepper;
+  }, [appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams]);
   var handleSelectProduct = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, clickType) {
       var type;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -94,7 +105,9 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                   open_deposit: 1
                 }),
                 setting: {
-                  can_input: true
+                  can_input: true,
+                  item_max_length: isShowProductDetailStepper,
+                  is_detail_open: clickType === 'cover'
                 }
               },
               callback: function () {
@@ -223,7 +236,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                     }
                   }, _callee);
                 }));
-                function callback(_x2) {
+                function callback(_x3) {
                   return _callback.apply(this, arguments);
                 }
                 return callback;
@@ -235,14 +248,14 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }, _callee2);
     }));
-    return function handleSelectProduct(_x) {
-      return _ref3.apply(this, arguments);
+    return function handleSelectProduct(_x, _x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
   var productListSetting = useMemo(function () {
     var _context$engine, _productListBlock;
-    var _ref4 = ((_context$engine = context.engine) === null || _context$engine === void 0 ? void 0 : _context$engine.props) || {},
-      customPageData = _ref4.customPageData;
+    var _ref5 = ((_context$engine = context.engine) === null || _context$engine === void 0 ? void 0 : _context$engine.props) || {},
+      customPageData = _ref5.customPageData;
     var productListBlock;
     if (Array.isArray(customPageData === null || customPageData === void 0 ? void 0 : customPageData.block)) {
       productListBlock = customPageData.block.find(function (b) {
@@ -274,7 +287,8 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
       cardSelectedBg: 'var(--theme-color)'
     },
     productListSetting: productListSetting,
-    selectedItems: carts
+    selectedItems: carts,
+    hideCategoryWhenOne: true
   }));
 });
 export default Services;

package/es/components/appointmentBooking/hooks.js

@@ -367,6 +367,11 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
                   if (res === 'success') {
                     checkHolder();
                   }
+
+                  // 关闭登录弹窗
+                  if (res === 'close') {
+                    setLoading(false);
+                  }
                 });
                 return _context3.abrupt("return", openLoginModal({
                   callback: function callback(status) {

package/es/components/authentication/admin/AuthMethods/AuthMethods.less

@@ -0,0 +1,136 @@
+.auth-methods {
+  background: #fff;
+  padding: 0;
+}
+
+.auth-methods-item {
+  display: flex;
+  align-items: center;
+  border: 1px solid #f0f0f0;
+  border-radius: 8px;
+  background: #fff;
+  margin-bottom: 12px;
+}
+
+.auth-methods-item-body {
+  display: flex;
+  flex: 1;
+  padding: 20px 24px 20px 0;
+  align-items: center;
+}
+
+.auth-methods-item:hover {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.auth-methods-item-drag {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #d9d9d9;
+  font-size: 20px;
+  padding-left: 24px;
+  padding-right: 16px;
+  cursor: grab;
+  align-self: stretch;
+}
+
+.auth-methods-item-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 40px;
+  height: 40px;
+  margin-right: 16px;
+}
+
+.auth-methods-item-content {
+  flex: 1;
+  min-width: 0;
+}
+
+.auth-methods-item-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 4px;
+}
+
+.auth-methods-item-title {
+  font-size: 15px;
+  font-weight: 500;
+  color: #262626;
+  margin-right: 8px;
+}
+
+.auth-methods-item-category {
+  display: inline-block;
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 400;
+}
+
+.auth-methods-item-category.general {
+  color: #4096ff;
+  background: #e6f4ff;
+  border: 1px solid #91caff;
+}
+
+.auth-methods-item-category.password-free {
+  color: #52c41a;
+  background: #f6ffed;
+  border: 1px solid #b7eb8f;
+}
+
+.auth-methods-item-category.auth-free {
+  color: #8c8c8c;
+  background: #f5f5f5;
+  border: 1px solid #d9d9d9;
+}
+
+.auth-methods-item-category.oauth {
+  color: #722ed1;
+  background: #f9f0ff;
+  border: 1px solid #d3adf7;
+}
+
+.auth-methods-item-description {
+  font-size: 13px;
+  color: #8c8c8c;
+  line-height: 1.5;
+}
+
+.auth-methods-item-config-link {
+  font-size: 12px;
+  color: #4096ff;
+  display: inline-block;
+}
+
+.auth-methods-item-config-link .anticon {
+  margin-right: 4px;
+  font-size: 14px;
+}
+
+.auth-methods-item-config-link:hover {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.auth-methods-item-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-left: 16px;
+}
+
+.auth-methods-dragging {
+  opacity: 0.5;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.auth-methods-empty {
+  padding: 48px 24px;
+  text-align: center;
+  color: #8c8c8c;
+}
+

package/es/components/authentication/admin/AuthMethods/SettingList.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { AuthMethodsProps } from './types';
+import './SettingList.less';
+declare const SettingList: React.FC<AuthMethodsProps>;
+export default SettingList;

package/es/components/authentication/admin/AuthMethods/SettingList.js

@@ -0,0 +1,62 @@
+import React from 'react';
+import { Button } from 'antd';
+import classNames from 'classnames';
+import { locales } from '@pisell/utils';
+import { getDefaultAuthMethods } from "./constants";
+import localeTexts from "./locales";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import "./SettingList.less";
+var SettingList = function SettingList(_ref) {
+  var _context$engine;
+  var className = _ref.className,
+    style = _ref.style,
+    initialMethods = _ref.methods,
+    onToggle = _ref.onToggle,
+    onSettings = _ref.onSettings,
+    onConfigClick = _ref.onConfigClick,
+    _ref$enableSetting = _ref.enableSetting,
+    enableSetting = _ref$enableSetting === void 0 ? true : _ref$enableSetting,
+    renderTitle = _ref.renderTitle;
+  var context = useEngineContext();
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+  var methods = initialMethods || getDefaultAuthMethods();
+  var handleSettings = function handleSettings(method) {
+    onSettings === null || onSettings === void 0 || onSettings(method);
+  };
+
+  // SettingList组件中，根据业务逻辑判断是否显示设置按钮
+  // 与AuthMethods组件不同，这里可以为更多的方法类型显示设置按钮
+  var shouldShowSettings = function shouldShowSettings(method) {
+    // 如果外部禁用了设置按钮，直接返回 false
+    if (!enableSetting) {
+      return false;
+    }
+    // 否则所有方法在SettingList中都显示设置按钮
+    return true;
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames('setting-list', className),
+    style: style
+  }, methods.map(function (method) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: method.id,
+      className: "setting-list-item"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "setting-list-item-icon"
+    }, method.icon), /*#__PURE__*/React.createElement("div", {
+      className: "setting-list-item-content"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "setting-list-item-title"
+    }, renderTitle ? renderTitle(method) : method.title), /*#__PURE__*/React.createElement("div", {
+      className: "setting-list-item-description"
+    }, method.description)), /*#__PURE__*/React.createElement("div", {
+      className: "setting-list-item-actions"
+    }, shouldShowSettings(method) && /*#__PURE__*/React.createElement(Button, {
+      type: "default",
+      onClick: function onClick() {
+        return handleSettings(method);
+      }
+    }, locales.getText('auth.button.settings'))));
+  }));
+};
+export default SettingList;

package/es/components/authentication/admin/AuthMethods/SettingList.less

@@ -0,0 +1,85 @@
+.setting-list {
+  background: #fff;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.setting-list-item {
+  display: flex;
+  align-items: center;
+  padding: 20px 24px;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  background: #ffffff;
+  transition: all 0.2s;
+}
+
+.setting-list-item:hover {
+  border-color: #d9d9d9;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.setting-list-item-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 48px;
+  height: 48px;
+  margin-right: 16px;
+  border-radius: 8px;
+  background: #fafafa;
+}
+
+.setting-list-item-content {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.setting-list-item-title {
+  font-size: 16px;
+  font-weight: 500;
+  color: #262626;
+}
+
+.setting-list-item-description {
+  font-size: 13px;
+  color: #8c8c8c;
+  line-height: 1.5;
+}
+
+.setting-list-item-status {
+  display: inline-flex;
+  align-items: center;
+}
+
+.setting-list-item-actions {
+  margin-left: 16px;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .setting-list-item {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .setting-list-item-icon {
+    margin-bottom: 12px;
+  }
+
+  .setting-list-item-actions {
+    margin-left: 0;
+    margin-top: 12px;
+    width: 100%;
+  }
+
+  .setting-list-item-actions button {
+    width: 100%;
+  }
+}
+

package/es/components/authentication/admin/AuthMethods/SettingsDrawer.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+import { AuthMethod } from './types';
+import { EmailSettings, PhoneSettings, DefaultSettings, PasswordRulesSettings } from './components';
+import './SettingsDrawer.less';
+interface SettingsDrawerProps {
+    open: boolean;
+    method: AuthMethod | null;
+    onClose: () => void;
+    onSave?: (settings: EmailSettings | PhoneSettings | DefaultSettings | PasswordRulesSettings) => void;
+    /**
+     * 模式：
+     * - 'auth-methods': 来自AuthMethods组件，显示所有设置包括启用/禁用
+     * - 'setting-list': 来自SettingList组件，不显示默认的启用/禁用设置
+     */
+    mode?: 'auth-methods' | 'setting-list';
+    /**
+     * 初始设置值
+     */
+    initialSettings?: EmailSettings | PhoneSettings | DefaultSettings | PasswordRulesSettings;
+}
+declare const SettingsDrawer: React.FC<SettingsDrawerProps>;
+export default SettingsDrawer;

package/es/components/authentication/admin/AuthMethods/SettingsDrawer.js

@@ -0,0 +1,121 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React from 'react';
+import { Drawer, Button } from 'antd';
+import { locales } from '@pisell/utils';
+import { AuthMethodType } from "./types";
+import { EmailSettingsContent, PhoneSettingsContent, DefaultSettingsContent, PasswordRulesSettingsContent } from "./components";
+import "./SettingsDrawer.less";
+import localeTexts from "./locales";
+
+// 初始化 locales
+locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
+var SettingsDrawer = function SettingsDrawer(_ref) {
+  var open = _ref.open,
+    method = _ref.method,
+    onClose = _ref.onClose,
+    onSave = _ref.onSave,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? 'auth-methods' : _ref$mode,
+    initialSettings = _ref.initialSettings;
+  var _React$useState = React.useState(null),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    currentSettings = _React$useState2[0],
+    setCurrentSettings = _React$useState2[1];
+  var handleSave = function handleSave() {
+    // 只在点击保存按钮时才调用 onSave
+    if (currentSettings) {
+      onSave === null || onSave === void 0 || onSave(currentSettings);
+    }
+    onClose();
+  };
+  var handleCancel = function handleCancel() {
+    onClose();
+  };
+  var getDrawerTitle = function getDrawerTitle() {
+    if (!method) return locales.getText('auth.email.settings');
+    if (method.type === AuthMethodType.EMAIL) {
+      return locales.getText('auth.email.settings');
+    }
+    if (method.type === AuthMethodType.PHONE) {
+      return locales.getText('auth.phone.settings');
+    }
+    if (method.type === AuthMethodType.PASSWORD_RULES) {
+      return locales.getText('auth.password.settings');
+    }
+    return "".concat(method.title, " Settings");
+  };
+  var handleSettingsChange = function handleSettingsChange(settings) {
+    // 实时更新设置到本地状态，不触发保存
+    setCurrentSettings(settings);
+    console.log('Settings changed:', settings);
+  };
+  var renderContent = function renderContent() {
+    if (!method) return null;
+    switch (method.type) {
+      case AuthMethodType.EMAIL:
+        return /*#__PURE__*/React.createElement(EmailSettingsContent, {
+          initialSettings: initialSettings,
+          onSettingsChange: handleSettingsChange
+        });
+      case AuthMethodType.PHONE:
+        return /*#__PURE__*/React.createElement(PhoneSettingsContent, {
+          initialSettings: initialSettings,
+          onSettingsChange: handleSettingsChange
+        });
+      case AuthMethodType.PASSWORD_RULES:
+        return /*#__PURE__*/React.createElement(PasswordRulesSettingsContent, {
+          initialSettings: initialSettings,
+          onSettingsChange: handleSettingsChange
+        });
+      default:
+        // SettingList 模式下，对于没有特定设置的方法，显示空状态或提示
+        if (mode === 'setting-list') {
+          return /*#__PURE__*/React.createElement("div", {
+            className: "settings-section"
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "settings-section-description",
+            style: {
+              padding: '20px 0',
+              color: '#8c8c8c'
+            }
+          }, locales.getText('auth.settings.no.additional')));
+        }
+        // AuthMethods 模式下，显示默认的启用/禁用设置
+        return /*#__PURE__*/React.createElement(DefaultSettingsContent, {
+          method: method,
+          onSettingsChange: handleSettingsChange
+        });
+    }
+  };
+  return /*#__PURE__*/React.createElement(Drawer, {
+    title: getDrawerTitle(),
+    placement: "right",
+    width: 640,
+    open: open,
+    onClose: handleCancel,
+    maskClosable: true,
+    keyboard: true,
+    footer: /*#__PURE__*/React.createElement("div", {
+      className: "drawer-footer"
+    }, /*#__PURE__*/React.createElement(Button, {
+      onClick: handleCancel
+    }, locales.getText('auth.button.cancel')), /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      onClick: handleSave,
+      style: {
+        marginLeft: 8
+      }
+    }, locales.getText('auth.button.save')))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "settings-drawer-content",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, renderContent()));
+};
+export default SettingsDrawer;