@pisell/private-materials 3.0.42 → 3.0.44

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

@@ -42,6 +42,7 @@ var import_customSelect = __toESM(require("../../components/customSelect"));
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var Info = () => {
   var _a, _b, _c, _d, _e, _f;
   const modalRef = (0, import_react.useRef)();
@@ -54,6 +55,7 @@ var Info = () => {
     total: 0,
     search: ""
   });
+  const context = (0, import_useEngineContext.default)();
   const menus = (0, import_react.useMemo)(() => {
     let list = [
       { key: "view", label: import_utils.locales.getText("pisell2.text.view-profile") },
@@ -267,6 +269,7 @@ var Info = () => {
   ), /* @__PURE__ */ import_react.default.createElement(
     import_customSelect.default,
     {
+      autoFocus: !state.isTerminal,
       modalOpen: state.modalOpen,
       ref: modalRef,
       rowKey: "id",

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

@@ -82,11 +82,13 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2;
     modal.dispatch({
       type: "setState",
       payload: {
         setGlobalState: props.setGlobalState,
-        ...globalState
+        ...globalState,
+        isTerminal: (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.isTerminal) == null ? void 0 : _c2.call(_b2)
       }
     });
   }, [globalState]);
@@ -103,7 +105,7 @@ var Info = (0, import_model.Provider)((props) => {
     if ((globalState == null ? void 0 : globalState.renderType) === "eventBooking") {
       return import_utils.locales.getText("pisell2.text.enroll");
     }
-    return (globalState == null ? void 0 : globalState.bookingId) ? /* @__PURE__ */ import_react.default.createElement(import_header.default, { state: modal.state, dispatch: modal.dispatch }) : import_utils.locales.getText("pisell2.text.new-appointment");
+    return (globalState == null ? void 0 : globalState.bookingId) ? /* @__PURE__ */ import_react.default.createElement(import_header.default, { state: modal.state, dispatch: modal.dispatch }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { height: 20 } });
   }, [
     globalState == null ? void 0 : globalState.bookingId,
     modal.state,

package/lib/components/booking/info/notes/index.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+import React from "react";
 declare const Notes: () => React.JSX.Element;
 export default Notes;

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

@@ -52,7 +52,7 @@ var Notes = () => {
     ];
   }, [(_b = (_a = modal.state) == null ? void 0 : _a.notes) == null ? void 0 : _b.orderNote]);
   const noteChange = ({ note, status, noteType }) => {
-    var _a2;
+    var _a2, _b2, _c2;
     if (noteType === "internal") {
       let _list = [...(_a2 = modal.state) == null ? void 0 : _a2.notes.internalNotes];
       if (status == "add") {
@@ -75,6 +75,7 @@ var Notes = () => {
           internalNotes: _list
         }
       });
+      (_c2 = (_b2 = modal.state) == null ? void 0 : _b2.refreshData) == null ? void 0 : _c2.call(_b2, {});
       return;
     }
     if (noteType === "order") {

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

@@ -41,15 +41,18 @@ var import_utils = require("@pisell/utils");
 var import_forms = __toESM(require("../../forms/forms"));
 var import_format = require("../../forms/format");
 var import_utils2 = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var Pet = () => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [valueLoading, setValueLoading] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const params = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
-  }, [(_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject]);
+  }, [(_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
   const petForm = (0, import_react.useMemo)(() => {
     return (state.pet.formData || [])[0];
   }, [state.pet.formData]);
@@ -76,10 +79,7 @@ var Pet = () => {
         formData: [
           {
             ...formData,
-            // ...formData.form,
-            // form_id: formData.form.id,
             options: _list
-            // type: formData.type,
           }
         ],
         pets: _list
@@ -204,7 +204,7 @@ var Pet = () => {
       type: "setPet",
       payload: { value: changeFormValuesData }
     });
-  }, [(_d = state.client.value) == null ? void 0 : _d.id]);
+  }, [(_e = state.client.value) == null ? void 0 : _e.id]);
   (0, import_react.useEffect)(() => {
     if (state.bookingId) {
       if (!state.bookingDetail) {
@@ -219,7 +219,7 @@ var Pet = () => {
     state.bookingDetail,
     params.form_id,
     params.type,
-    (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id
+    (_g = (_f = state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id
   ]);
   const addCallback = () => {
     var _a2, _b2;
@@ -242,12 +242,13 @@ var Pet = () => {
       modalOpen: state.modalOpen,
       value: state.pet.value,
       onChange: onValueChange,
-      client: (_g = state.client) == null ? void 0 : _g.value,
+      client: (_h = state.client) == null ? void 0 : _h.value,
       customSelectProps: {
         loading,
         handleViewItem,
         virtualListHeight: window.innerHeight - 213 - 57 - 16,
-        disabled: state.disabledEdit
+        disabled: state.disabledEdit,
+        autoFocus: !state.isTerminal
       },
       optionRender: (item) => {
         return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(

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

@@ -45,11 +45,19 @@ var import_serve = require("../serve");
 var import_utils = require("../../utils");
 var import_utils2 = require("../../../utils");
 var import_utils3 = require("@pisell/utils");
+var shopList = [2886, 4422, 5538];
+var getCacheResourceId = () => {
+  const serviceParams = (0, import_utils2.getCacheParams)();
+  let resId = Number(serviceParams == null ? void 0 : serviceParams.resource_id);
+  console.log("resIdresIdresId", resId);
+  return resId;
+};
 var Info = () => {
-  var _a;
+  var _a, _b, _c;
   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 searchRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
@@ -101,6 +109,11 @@ var Info = () => {
       }
     });
   };
+  const autoAddProduct = async (cacheItem) => {
+    let resId = getCacheResourceId();
+    let _cacheItem = { ...cacheItem };
+    (0, import_utils2.deleteCacheParams)();
+  };
   const getServices = async () => {
     var _a2;
     setLoading(true);
@@ -109,10 +122,6 @@ var Info = () => {
       num: 500,
       extension_type: state.renderType === "eventBooking" ? void 0 : ["product_appointment", "appointment_ticket"],
       with: ["category"],
-      // include_formula: "no",
-      // include_bundle: "no",
-      // include_option: "no",
-      // include_variant: "no",
       ids: state.renderType === "eventBooking" ? (_a2 = state.eventOtherParams) == null ? void 0 : _a2.productIds : void 0,
       open_quotation: 1,
       with_schedule: 1,
@@ -139,6 +148,12 @@ var Info = () => {
         addModal: true
       }
     });
+    if (!state.isTerminal) {
+      setTimeout(() => {
+        var _a2, _b2;
+        (_b2 = (_a2 = searchRef.current) == null ? void 0 : _a2.focus) == null ? void 0 : _b2.call(_a2);
+      }, 100);
+    }
   };
   const handleSelectProduct = (item, type) => {
     const isEject = type === "detail" || item.bundle_group_count > 0;
@@ -180,11 +195,14 @@ var Info = () => {
           cacheItem.new = 0;
         }
         console.log("_total", cacheItem);
+        let resId = getCacheResourceId();
+        cacheItem.autoClose = !!resId;
         dispatch({
           type: "setService",
           payload: {
             editModal: true,
-            cacheItem
+            cacheItem,
+            addModal: !cacheItem.autoClose
           }
         });
       }
@@ -205,9 +223,16 @@ var Info = () => {
     return state.service.value.length > 0;
   }, [state.service.value]);
   (0, import_react.useEffect)(() => {
-    if (state.modalOpen) {
+    var _a2, _b2, _c2, _d, _e;
+    if (shopList.includes(
+      (_e = (_d = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id
+    )) {
+      return;
+    }
+    if (state.modalOpen && !state.bookingId) {
+      handleSelectService();
     }
-  }, [state.modalOpen]);
+  }, [state.modalOpen, state.bookingId]);
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -240,7 +265,7 @@ var Info = () => {
     state.service.value,
     loading
   ]);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, addButton, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = (_b = state.service) == null ? void 0 : _b.cacheItem) == null ? void 0 : _c.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       open: state.service.addModal,
@@ -257,6 +282,7 @@ var Info = () => {
       header: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
         {
+          ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
           placeholder: import_utils3.locales.getText("pisell2.text.search"),

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

@@ -49,7 +49,7 @@ var import_utils3 = require("../../../utils");
 var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
 var Info = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useLikeStatus = import_antd.Form.useWatch("like_status", form);
@@ -187,7 +187,7 @@ var Info = () => {
         }
       } else {
         let _useResource = 0;
-        if (_list.length === 2) {
+        if (_list.length === 2 && useResource !== 0) {
           _useResource = _list[1].form_record_id;
         }
         form.setFieldsValue({
@@ -200,6 +200,12 @@ var Info = () => {
           resources: _list
         }
       });
+      setTimeout(() => {
+        var _a2;
+        if (((_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose) || _list.length === 1 && useResource === 0) {
+          form.submit();
+        }
+      }, 200);
     } catch (err) {
     }
     setResourceLoading(false);
@@ -269,7 +275,11 @@ var Info = () => {
   const onFinish = (values) => {
     var _a2;
     let _list = [...state.service.value];
-    let _item = { ...state.service.cacheItem, errorList };
+    let _item = {
+      ...state.service.cacheItem,
+      autoClose: false,
+      errorList
+    };
     let _extend = {
       ..._item._extend,
       ...values
@@ -306,7 +316,8 @@ var Info = () => {
   const setEditData = (0, import_ahooks.useMemoizedFn)(() => {
     if (state.service.editModal) {
       let cacheItem = state.service.cacheItem;
-      form.setFieldsValue((0, import_utils3.getServerItemExtend)(state, cacheItem, timeObj));
+      let values = (0, import_utils3.getServerItemExtend)(state, cacheItem, timeObj);
+      form.setFieldsValue(values);
       if (state.renderType !== "eventBooking") {
         getResources();
       }
@@ -357,7 +368,8 @@ var Info = () => {
     import_drawer.default,
     {
       zIndex: 1e3,
-      open: state.service.editModal,
+      forceRender: true,
+      open: state.service.editModal && !((_j = state.service.cacheItem) == null ? void 0 : _j.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -386,7 +398,7 @@ var Info = () => {
           });
         }
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.product_name) || "-"),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_m = (_l = (_k = state.service) == null ? void 0 : _k.cacheItem) == null ? void 0 : _l._extend) == null ? void 0 : _m.product_name) || "-"),
       /* @__PURE__ */ import_react.default.createElement(
         import_collapsibleList.default,
         {
@@ -411,8 +423,8 @@ var Info = () => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_n = (_m = state.service.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.origin_total) || 0,
-          placeholder: ((_p = (_o = state.service.cacheItem) == null ? void 0 : _o._extend) == null ? void 0 : _p.origin_total) || "0"
+          max: ((_o = (_n = state.service.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.origin_total) || 0,
+          placeholder: ((_q = (_p = state.service.cacheItem) == null ? void 0 : _p._extend) == null ? void 0 : _q.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -141,6 +141,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -284,6 +285,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -427,6 +429,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   "en": {
     "pisell2.text.select-addons": "Select addons",
-    "pisell2.text.addons": "Addons",
+    "pisell2.text.addons": "Sales",
     "pisell2.text.search": "Search",
     "pisell2.text.view": "View",
     "pisell2.text.edit": "Edit",
@@ -173,7 +173,8 @@ var locales_default = {
     "pisell2.text.deposit-delete": "Delete deposit",
     "pisell2.text.deposit-delete-message-title": "Prompt",
     "pisell2.text.deposit-delete-message": "It cannot be restored after deletion. Please confirm the operation.",
-    "pisell2.text.deposit-paid": "Deposit paid"
+    "pisell2.text.deposit-paid": "Deposit paid",
+    "pisell2.text.stock": "Stock"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -181,7 +182,7 @@ var locales_default = {
     "pisell2.text.amount-paid-on-order": "订单已付金额",
     "pisell2.text.please-select-the-customer-first": "请先选择客户",
     "pisell2.text.change": "更改",
-    "pisell2.text.addons": "附加商品",
+    "pisell2.text.addons": "销售",
     "pisell2.text.select-addons": "选择附加商品",
     "pisell2.text.search": "搜索",
     "pisell2.text.view": "查看",
@@ -330,7 +331,8 @@ var locales_default = {
     "pisell2.text.deposit-delete": "删除定金",
     "pisell2.text.deposit-delete-message-title": "提示",
     "pisell2.text.deposit-delete-message": "删除后不可恢复，请确认操作",
-    "pisell2.text.deposit-paid": "已付定金"
+    "pisell2.text.deposit-paid": "已付定金",
+    "pisell2.text.stock": "库存"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -338,7 +340,7 @@ var locales_default = {
     "pisell2.text.amount-paid-on-order": "訂單已付金額",
     "pisell2.text.please-select-the-customer-first": "請先選擇客戶",
     "pisell2.text.change": "更改",
-    "pisell2.text.addons": "附加商品",
+    "pisell2.text.addons": "销售",
     "pisell2.text.select-addons": "選擇附加商品",
     "pisell2.text.search": "搜索",
     "pisell2.text.view": "查看",
@@ -487,6 +489,7 @@ var locales_default = {
     "pisell2.text.deposit-delete": "刪除定金",
     "pisell2.text.deposit-delete-message-title": "提示",
     "pisell2.text.deposit-delete-message": "刪除後不可恢復，請確認操作",
-    "pisell2.text.deposit-paid": "已付定金"
+    "pisell2.text.deposit-paid": "已付定金",
+    "pisell2.text.stock": "庫存"
   }
 };

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

@@ -70,11 +70,13 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: 'eventBooking';
+    renderType?: "eventBooking";
+    modalOpen?: boolean;
+    isTerminal?: boolean;
     eventOtherParams?: {
         relation_id: number;
         number: number;
-        registration_type: 'single' | 'all' | 'extra_include';
+        registration_type: "single" | "all" | "extra_include";
         start_date: string;
         start_time: string;
         end_date: string;

package/lib/components/booking/notes/index.js

@@ -78,9 +78,10 @@ var Notes = (0, import_model.Provider)((props) => {
     });
   }, [globalState]);
   const noteChange = ({ note, status, noteType }) => {
-    var _a2;
+    var _a2, _b2, _c2;
+    (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.refreshData) == null ? void 0 : _b2.call(_a2, {});
     if (noteType === "internal") {
-      let _list = [...(_a2 = modal.state) == null ? void 0 : _a2.notes.internalNotes];
+      let _list = [...(_c2 = modal.state) == null ? void 0 : _c2.notes.internalNotes];
       if (status == "add") {
         _list.push(note);
       }

package/lib/components/booking/utils.js

@@ -431,9 +431,9 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
       if (str) {
         findNextSliceProps.date = (0, import_dayjs.default)(str).format("HH:mm");
       }
-      let resourceId = serviceParams.resource_id;
-      if (resourceId) {
-        _extend.resource = Number(resourceId);
+      let resourceId = Number(serviceParams.resource_id);
+      if (resourceId || resourceId === 0) {
+        _extend.resource = resourceId;
       }
     }
     console.log("_extend", findNextSliceProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.42",
+  "version": "3.0.44",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,8 +59,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "@pisell/utils": "1.0.24",
-    "@pisell/date-picker": "1.0.69",
-    "@pisell/icon": "0.0.8"
+    "@pisell/icon": "0.0.8",
+    "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {
     "react": "^18.0.0",