@pisell/private-materials 3.0.164 → 3.0.166

package/es/components/booking/dashboard/index.js

@@ -35,13 +35,14 @@ var translationOriginal = function translationOriginal(text) {
 var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
   var map = {};
   data.forEach(function (item) {
-    if (!map[item.id]) {
-      map[item.id] = {
+    var name = translationOriginal(item.name) || "default";
+    if (!map[name]) {
+      map[name] = {
         label: !item.id ? locales.getText('pisell2.booking.dashboard.default') : translationOriginal(item.name) || '',
         value: 0
       };
     }
-    map[item.id].value = (map[item.id].value || 0) + (item.value || 0);
+    map[name].value = (map[name].value || 0) + (item.value || 0);
   });
   return Object.values(map).sort(function (a, b) {
     return b.label.localeCompare(a.label);

package/es/components/booking/hooks/useClearCart.js

@@ -17,7 +17,7 @@ var useClearCart = function useClearCart(state, dispatch) {
       }
     });
   };
-  return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service$value = _state$service.value) !== null && _state$service$value !== void 0 && _state$service$value.length) && /*#__PURE__*/React.createElement("span", {
+  return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service$value = _state$service.value) !== null && _state$service$value !== void 0 && _state$service$value.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
     className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2$value = _state$service2.value) !== null && _state$service2$value !== void 0 && _state$service2$value.length))),
     onClick: handleClear
   }, /*#__PURE__*/React.createElement(Iconfont, {

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

@@ -17,7 +17,6 @@ var ServiceItem = function ServiceItem(_ref) {
     resourceItem = _ref.resourceItem,
     errorMessage = _ref.errorMessage,
     handleDeleteService = _ref.handleDeleteService;
-  console.log(d, 'dddddd');
   var resourceName = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.labelText) || d.relation_form_name;
   var isDiscount = useMemo(function () {
     var _d$_extend, _d$_extend2;
@@ -29,7 +28,7 @@ var ServiceItem = function ServiceItem(_ref) {
     onClick: function onClick() {
       handleEditService(d);
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !state.channelDisabledEdit && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-delete",
     onClick: function onClick(e) {
       e.stopPropagation();

package/es/components/booking/info2/service/serviceItem/index.js

@@ -7,7 +7,7 @@ import { renderBundles } from "../../../components/collapsibleList/utils";
 import { Alert, Button } from 'antd';
 import Actions from "../actions";
 import "./index.less";
-import { Iconfont } from "@pisell/materials";
+import { Iconfont } from '@pisell/materials';
 var getName = function getName(name, locale) {
   return name[locale] || name['original'] || name['en'] || '';
 };
@@ -129,7 +129,7 @@ var ServiceItem = function ServiceItem(_ref) {
     onClick: function onClick() {
       handleEditService(d);
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !state.channelDisabledEdit && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-delete",
     onClick: function onClick(e) {
       e.stopPropagation();

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

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => React.JSX.Element;
 export default SelectResourcesTable;

package/es/components/productExtension/fields/SelectResourcesTable/index.js

@@ -13,10 +13,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useMemo, useEffect } from "react";
-import { Select } from "antd";
+import React, { useState, useMemo, useEffect } from 'react';
+import { Select } from 'antd';
 // import {} from '@pisell/materials'
-import { locales } from "@pisell/utils";
+import { locales } from '@pisell/utils';
 import { getFormTypes, getAllResource } from "./server";
 import "./index.less";
 var sortArrayByOrder = function sortArrayByOrder(arr1, arr2, reverse) {
@@ -38,26 +38,35 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
+
+  /**
+   * @title: 获取数据
+   * @description:
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-11-04 17:07
+   */
   var _getData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getFormTypes, _getAllResource, _yield$Promise$all, _yield$Promise$all2, forms, resources, _data;
+      var _getFormTypes, _getAllResource, _yield$Promise$all, _yield$Promise$all2, forms, resources, defaultResourceId, _data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            // 获取资源分类
             _getFormTypes = getFormTypes({
-              type: "manual",
+              type: 'manual',
               num: 500,
               skip: 1,
-              status: "published"
+              status: 'published'
             }, {
               useCache: true
-            });
+            }); // 获取资源列表
             _getAllResource = getAllResource({
               num: 500,
               skip: 1
             }, {
               useCache: true
-            });
+            }); // 合并请求
             _context.next = 4;
             return Promise.all([_getFormTypes, _getAllResource]);
           case 4:
@@ -65,11 +74,24 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
             _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
             forms = _yield$Promise$all2[0];
             resources = _yield$Promise$all2[1];
+            // 需要默认选择的资源
+            defaultResourceId = getDefaultResourceId();
             _data = (forms || []).reduce(function (arr, item) {
+              // 根据资源分类,找到该分类下的所有资源
               var currentResource = (resources || []).filter(function (relation) {
                 return relation.form_id === item.id;
               });
               if (currentResource.length > 0) {
+                // 设置默认资源
+                if (defaultResourceId && currentResource.some(function (d) {
+                  return d.id == defaultResourceId;
+                })) {
+                  // 返回上层
+                  _onChange([defaultResourceId], item.id);
+                  // 清空默认值
+                  removeDefaultResourceId();
+                  defaultResourceId = undefined;
+                }
                 arr.push(_objectSpread(_objectSpread({
                   label: item.title,
                   key: item.id,
@@ -82,7 +104,7 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
               return arr;
             }, []);
             setData(_data);
-          case 10:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -92,6 +114,29 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+
+  /**
+   * @title: 获取默认选择的资源
+   * @description:
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-11-04 17:09
+   */
+  var getDefaultResourceId = function getDefaultResourceId() {
+    var _serviceParams;
+    var serviceParams = sessionStorage.getItem('pisell2.eventBooking.serviceParams');
+    if (serviceParams) {
+      serviceParams = JSON.parse(serviceParams);
+    }
+    var resource_id = (_serviceParams = serviceParams) === null || _serviceParams === void 0 ? void 0 : _serviceParams.resource_id;
+    if (resource_id) {
+      resource_id = Number(resource_id);
+    }
+    return resource_id;
+  };
+  var removeDefaultResourceId = function removeDefaultResourceId() {
+    sessionStorage.setItem('pisell2.eventBooking.serviceParams', '');
+  };
   var _dataSource = useMemo(function () {
     if (value) {
       // 创建一个排序键对象
@@ -136,10 +181,11 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_value);
   };
+  console.log('value', value);
   var columns = useMemo(function () {
     return [{
-      title: locales.getText("pisell2.text.product-extension.resource-type"),
-      dataIndex: "title",
+      title: locales.getText('pisell2.text.product-extension.resource-type'),
+      dataIndex: 'title',
       value: value,
       data: data,
       width: 100
@@ -163,23 +209,23 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     // 	},
     // },
     {
-      title: locales.getText("pisell2.text.product-extension.options"),
-      dataIndex: "form_id",
+      title: locales.getText('pisell2.text.product-extension.options'),
+      dataIndex: 'form_id',
       render: function render(form_id, record, index) {
         var cur = value === null || value === void 0 ? void 0 : value.find(function (d) {
           return d.form_id === form_id;
         });
         return /*#__PURE__*/React.createElement(Select, {
           style: {
-            width: "100%"
+            width: '100%'
           },
           mode: "multiple",
           value: (cur === null || cur === void 0 ? void 0 : cur.form_record_ids) || [],
           options: record.options,
           popupMatchSelectWidth: false,
           fieldNames: {
-            label: "title",
-            value: "id"
+            label: 'title',
+            value: 'id'
           },
           onChange: function onChange(val) {
             _onChange(val, form_id);
@@ -200,13 +246,13 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     className: "",
     dragSort: true,
     onSortChange: sortChange,
-    rowKey: "form_id",
+    rowKey: 'form_id',
     columns: columns,
     dataSource: _dataSource,
     pagination: false,
     virtual: false,
     scroll: {
-      x: "auto"
+      x: 'auto'
     }
   });
 };

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

@@ -44,13 +44,14 @@ var translationOriginal = (text) => "";
 var formatCapacityToChildrenData = (data) => {
   const map = {};
   data.forEach((item) => {
-    if (!map[item.id]) {
-      map[item.id] = {
+    const name = translationOriginal(item.name) || "default";
+    if (!map[name]) {
+      map[name] = {
         label: !item.id ? import_utils.locales.getText("pisell2.booking.dashboard.default") : translationOriginal(item.name) || "",
         value: 0
       };
     }
-    map[item.id].value = (map[item.id].value || 0) + (item.value || 0);
+    map[name].value = (map[name].value || 0) + (item.value || 0);
   });
   return Object.values(map).sort((a, b) => b.label.localeCompare(a.label));
 };

package/lib/components/booking/hooks/useClearCart.js

@@ -46,7 +46,7 @@ var useClearCart = (state, dispatch) => {
       }
     });
   };
-  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && /* @__PURE__ */ import_react.default.createElement(
+  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {

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

@@ -52,7 +52,6 @@ var ServiceItem = ({
   handleDeleteService
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  console.log(d, "dddddd");
   let resourceName = (resourceItem == null ? void 0 : resourceItem.labelText) || d.relation_form_name;
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -67,7 +66,7 @@ var ServiceItem = ({
         handleEditService(d);
       }
     },
-    /* @__PURE__ */ import_react.default.createElement(
+    !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "pisell-lowcode__booking-service-item-delete",

package/lib/components/booking/info2/service/serviceItem/index.js

@@ -147,7 +147,7 @@ var ServiceItem = ({
         handleEditService(d);
       }
     },
-    /* @__PURE__ */ import_react.default.createElement(
+    !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "pisell-lowcode__booking-service-item-delete",

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

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => React.JSX.Element;
 export default SelectResourcesTable;

package/lib/components/productExtension/fields/SelectResourcesTable/index.js

@@ -60,11 +60,17 @@ var SelectResourcesTable = ({ value, onChange }) => {
       _getFormTypes,
       _getAllResource
     ]);
+    let defaultResourceId = getDefaultResourceId();
     let _data = (forms || []).reduce((arr, item) => {
       const currentResource = (resources || []).filter(
         (relation) => relation.form_id === item.id
       );
       if (currentResource.length > 0) {
+        if (defaultResourceId && currentResource.some((d) => d.id == defaultResourceId)) {
+          _onChange([defaultResourceId], item.id);
+          removeDefaultResourceId();
+          defaultResourceId = void 0;
+        }
         arr.push({
           label: item.title,
           key: item.id,
@@ -79,6 +85,22 @@ var SelectResourcesTable = ({ value, onChange }) => {
     }, []);
     setData(_data);
   };
+  const getDefaultResourceId = () => {
+    let serviceParams = sessionStorage.getItem(
+      "pisell2.eventBooking.serviceParams"
+    );
+    if (serviceParams) {
+      serviceParams = JSON.parse(serviceParams);
+    }
+    let resource_id = serviceParams == null ? void 0 : serviceParams.resource_id;
+    if (resource_id) {
+      resource_id = Number(resource_id);
+    }
+    return resource_id;
+  };
+  const removeDefaultResourceId = () => {
+    sessionStorage.setItem("pisell2.eventBooking.serviceParams", "");
+  };
   const _dataSource = (0, import_react.useMemo)(() => {
     if (value) {
       let sortOrder = {};
@@ -112,6 +134,7 @@ var SelectResourcesTable = ({ value, onChange }) => {
     }
     onChange == null ? void 0 : onChange(_value);
   };
+  console.log("value", value);
   const columns = (0, import_react.useMemo)(() => {
     return [
       {

package/package.json

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