@pisell/private-materials 3.0.18 → 3.0.20

package/es/components/booking/info/client/index.js

@@ -179,7 +179,10 @@ var Info = function Info() {
   var handleCreateItem = function handleCreateItem() {
     state.action({
       type: "pisell1.handleOpenAddCustomerModal",
-      data: {},
+      data: {
+        showReceiveAddress: false,
+        showAcceptsMarketing: false
+      },
       callback: function callback(customer_id) {
         getClients(_objectSpread(_objectSpread({}, state.client.clientsParams), {}, {
           search: "",

package/es/components/booking/info/service/addService/index.js

@@ -39,6 +39,10 @@ var Info = function Info() {
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   var setDefaultService = /*#__PURE__*/function () {
@@ -72,21 +76,25 @@ var Info = function Info() {
             }
             return _context.abrupt("return");
           case 9:
+            setLoading(true);
             product = list[0];
-            _context.next = 12;
+            _context.next = 13;
             return getProductDetail(product.id, {
               schedule_date: state.date.value.format("YYYY-MM-DD")
             });
-          case 12:
+          case 13:
             detail = _context.sent;
             // 商品是套餐或单规格多规格
-            isBundleOrCombination = getIsBundleOrCombination(detail.data); // 套餐商品单规格多规格不设置默认
+            isBundleOrCombination = getIsBundleOrCombination(detail.data);
+            setLoading(false);
+
+            // 套餐商品单规格多规格不设置默认
             if (!isBundleOrCombination) {
-              _context.next = 16;
+              _context.next = 18;
               break;
             }
             return _context.abrupt("return");
-          case 16:
+          case 18:
             _item = _objectSpread(_objectSpread({}, product), {}, {
               product_id: product.id,
               _id: getUniqueId(),
@@ -111,7 +119,7 @@ var Info = function Info() {
                 edit: true
               }
             });
-          case 19:
+          case 21:
           case "end":
             return _context.stop();
         }
@@ -128,7 +136,8 @@ var Info = function Info() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setLoading(true);
+            _context2.next = 3;
             return state.apis.getServices({
               skip: 1,
               num: 500,
@@ -142,8 +151,9 @@ var Info = function Info() {
               open_quotation: 1,
               with_schedule: 1
             });
-          case 2:
+          case 3:
             data = _context2.sent;
+            setLoading(false);
             setDefaultService(data === null || data === void 0 ? void 0 : data.list);
             dispatch({
               type: "setService",
@@ -151,7 +161,7 @@ var Info = function Info() {
                 services: (data === null || data === void 0 ? void 0 : data.list) || []
               }
             });
-          case 5:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -254,6 +264,7 @@ var Info = function Info() {
           height: 20
         }
       }) : /*#__PURE__*/React.createElement(AddButton, {
+        loading: loading,
         showSub: false,
         title: locales.getText("pisell2.text.add-a-service"),
         subTitle: locales.getText("pisell2.text.add-another-service"),
@@ -270,7 +281,7 @@ var Info = function Info() {
         height: 20
       }
     });
-  }, [state.renderType, showAddButton, isService, state.service.value]);
+  }, [state.renderType, showAddButton, isService, state.service.value, loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, addButton, /*#__PURE__*/React.createElement(Drawer, {
     open: state.service.addModal,
     title: locales.getText("pisell2.text.select-service"),

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

@@ -2,6 +2,7 @@ import React from "react";
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;
+    type: "all" | "once" | "batch";
 }
-declare const ProductExtension: ({ onDataChange }: ProductExtensionProps) => React.JSX.Element;
+declare const ProductExtension: ({ onDataChange, type }: ProductExtensionProps) => React.JSX.Element;
 export default ProductExtension;

package/es/components/productExtension/index.js

@@ -18,7 +18,8 @@ import localeTexts from "./locales";
 locales.init(localeTexts, localStorage.getItem("umi_locale") || "en");
 var ProductExtension = function ProductExtension(_ref) {
   var _extension$filed;
-  var onDataChange = _ref.onDataChange;
+  var onDataChange = _ref.onDataChange,
+    type = _ref.type;
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   var _getProductExtensionFields = useRequest(getProductExtensionFields, {
@@ -50,14 +51,18 @@ var ProductExtension = function ProductExtension(_ref) {
     round: true,
     loading: _getProductExtensionFields.loading
   }, (_extension$filed = extension.filed) === null || _extension$filed === void 0 ? void 0 : _extension$filed.map(function (item, index) {
-    var _item$, _item$2, _extension$extension;
+    var _item$, _item$2, _item$3, _extension$extension;
     var isHidden = ((_item$ = item[0]) === null || _item$ === void 0 ? void 0 : _item$.key) === "event_item_type";
+    // 编辑单个活动, 不展示schedule组件
+    if (type !== "all" && ((_item$2 = item[0]) === null || _item$2 === void 0 ? void 0 : _item$2.key) === "schedule.ids") {
+      return null;
+    }
     return /*#__PURE__*/React.createElement(Card, {
       hidden: isHidden,
       key: index
       // style={{ overflow: "inherit" }}
       ,
-      header: item.length === 1 ? (_item$2 = item[0]) === null || _item$2 === void 0 ? void 0 : _item$2.name : extension === null || extension === void 0 ? void 0 : (_extension$extension = extension.extension) === null || _extension$extension === void 0 ? void 0 : _extension$extension.name
+      header: item.length === 1 ? (_item$3 = item[0]) === null || _item$3 === void 0 ? void 0 : _item$3.name : extension === null || extension === void 0 ? void 0 : (_extension$extension = extension.extension) === null || _extension$extension === void 0 ? void 0 : _extension$extension.name
     }, item.map(function (child, childIndex) {
       var name = "".concat(child.id, "|").concat(child.key);
       return /*#__PURE__*/React.createElement(Form.Item, {

package/lib/components/booking/info/client/index.js

@@ -160,7 +160,10 @@ var Info = () => {
   const handleCreateItem = () => {
     state.action({
       type: "pisell1.handleOpenAddCustomerModal",
-      data: {},
+      data: {
+        showReceiveAddress: false,
+        showAcceptsMarketing: false
+      },
       callback: (customer_id) => {
         getClients({
           ...state.client.clientsParams,

package/lib/components/booking/info/service/addService/index.js

@@ -49,6 +49,7 @@ var Info = () => {
   var _a;
   const [search, setSearch] = (0, import_react.useState)("");
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const [loading, setLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
@@ -65,11 +66,13 @@ var Info = () => {
     if (_list.length !== 0) {
       return;
     }
+    setLoading(true);
     let product = list[0];
     const detail = await (0, import_serve.getProductDetail)(product.id, {
       schedule_date: state.date.value.format("YYYY-MM-DD")
     });
     const isBundleOrCombination = (0, import_utils.getIsBundleOrCombination)(detail.data);
+    setLoading(false);
     if (isBundleOrCombination)
       return;
     let _item = {
@@ -100,6 +103,7 @@ var Info = () => {
   };
   const getServices = async () => {
     var _a2;
+    setLoading(true);
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
@@ -113,6 +117,7 @@ var Info = () => {
       open_quotation: 1,
       with_schedule: 1
     });
+    setLoading(false);
     setDefaultService(data == null ? void 0 : data.list);
     dispatch({
       type: "setService",
@@ -208,6 +213,7 @@ var Info = () => {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,
         {
+          loading,
           showSub: false,
           title: import_utils3.locales.getText("pisell2.text.add-a-service"),
           subTitle: import_utils3.locales.getText("pisell2.text.add-another-service"),
@@ -224,7 +230,7 @@ var Info = () => {
         onClick: handleSelectService
       }
     ) : /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
-  }, [state.renderType, showAddButton, isService, state.service.value]);
+  }, [state.renderType, showAddButton, isService, state.service.value, loading]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {

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

@@ -2,6 +2,7 @@ import React from "react";
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;
+    type: "all" | "once" | "batch";
 }
-declare const ProductExtension: ({ onDataChange }: ProductExtensionProps) => React.JSX.Element;
+declare const ProductExtension: ({ onDataChange, type }: ProductExtensionProps) => React.JSX.Element;
 export default ProductExtension;

package/lib/components/productExtension/index.js

@@ -44,7 +44,7 @@ var import_index = require("./index.less");
 var import_utils2 = require("@pisell/utils");
 var import_locales = __toESM(require("./locales"));
 import_utils2.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
-var ProductExtension = ({ onDataChange }) => {
+var ProductExtension = ({ onDataChange, type }) => {
   var _a;
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
@@ -71,14 +71,17 @@ var ProductExtension = ({ onDataChange }) => {
     return Component ? /* @__PURE__ */ import_react.default.createElement(Component, { ..._props }) : null;
   };
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { active: true, round: true, loading: _getProductExtensionFields.loading }, (_a = extension.filed) == null ? void 0 : _a.map((item, index) => {
-    var _a2, _b, _c;
+    var _a2, _b, _c, _d;
     const isHidden = ((_a2 = item[0]) == null ? void 0 : _a2.key) === "event_item_type";
+    if (type !== "all" && ((_b = item[0]) == null ? void 0 : _b.key) === "schedule.ids") {
+      return null;
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       import_card.default,
       {
         hidden: isHidden,
         key: index,
-        header: item.length === 1 ? (_b = item[0]) == null ? void 0 : _b.name : (_c = extension == null ? void 0 : extension.extension) == null ? void 0 : _c.name
+        header: item.length === 1 ? (_c = item[0]) == null ? void 0 : _c.name : (_d = extension == null ? void 0 : extension.extension) == null ? void 0 : _d.name
       },
       item.map((child, childIndex) => {
         const name = `${child.id}|${child.key}`;

package/lowcode/product-extension/meta.ts

@@ -98,6 +98,17 @@ const ProductExtensionMeta: ComponentMetadata = {
         "name": "onDataChange",
         "setter": ["JsonSetter", "VariableSetter"],
       },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "type",
+            "zh-CN": "type"
+          }
+        },
+        "name": "type",
+        "setter": ["VariableSetter"],
+      },
     ],
     "supports": {},
     "component": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,9 +58,9 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/icon": "0.0.8",
     "@pisell/utils": "1.0.23",
-    "@pisell/date-picker": "1.0.68"
+    "@pisell/date-picker": "1.0.68",
+    "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",