@pisell/materials 3.2.27 → 3.2.29

package/es/components/productCard/components/MultiDay/index.d.ts

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

package/es/components/productCard/components/Time/components/SelectHolder/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const SelectHolder: ({ lists, value, onChange, holderMode }: any) => JSX.Element;
+declare const SelectHolder: ({ lists, value, onChange, holderMode, isShowAddHolderButton, onAddHolder, }: any) => JSX.Element;
 export default SelectHolder;

package/es/components/productCard/components/Time/components/SelectHolder/index.js

@@ -4,14 +4,17 @@ 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(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, { useCallback, useEffect, useState } from 'react';
-import { Select } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { Select, Divider, Button } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import "./index.less";
 var SelectHolder = function SelectHolder(_ref) {
   var lists = _ref.lists,
     value = _ref.value,
     _onChange = _ref.onChange,
-    holderMode = _ref.holderMode;
+    holderMode = _ref.holderMode,
+    isShowAddHolderButton = _ref.isShowAddHolderButton,
+    onAddHolder = _ref.onAddHolder;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectedValue = _useState2[0],
@@ -21,21 +24,19 @@ var SelectHolder = function SelectHolder(_ref) {
   }, [value]);
 
   /**
-   * @title: 渲染下拉框
+   * @title: 点击添加holder事件
    * @description:
-   * @param {*} useCallback
+   * @param {Event} e
    * @return {*}
    * @Author: WangHan
-   * @Date: 2025-04-11 14:57
+   * @Date: 2025-04-26 10:39
    */
-  var renderOptions = useCallback(function () {
-    return (lists || []).map(function (d) {
-      return /*#__PURE__*/React.createElement(Select.Option, {
-        value: d.id,
-        key: d.id
-      }, d['label']);
-    });
-  }, [lists]);
+  var addItem = function addItem(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    onAddHolder();
+  };
+  console.log(lists, 'select-holder');
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-product-card-select-holder"
   }, /*#__PURE__*/React.createElement(Select, {
@@ -49,7 +50,27 @@ var SelectHolder = function SelectHolder(_ref) {
         return d.id === val;
       });
       _onChange(item);
+    },
+    options: lists.map(function (item) {
+      return {
+        label: item === null || item === void 0 ? void 0 : item.label,
+        value: item === null || item === void 0 ? void 0 : item.id
+      };
+    }),
+    dropdownRender: function dropdownRender(menu) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, menu, isShowAddHolderButton ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+        style: {
+          margin: '8px 0'
+        }
+      }), /*#__PURE__*/React.createElement(Button, {
+        type: "text",
+        icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+        onClick: addItem,
+        style: {
+          width: '100%'
+        }
+      }, "Add item")) : null);
     }
-  }, renderOptions()));
+  }));
 };
 export default SelectHolder;

package/es/components/productCard/components/Time/components/SelectResource/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare const SelectResource: ({ lists, value, onChange }: any) => JSX.Element;
+declare const SelectResource: ({ lists, value, onChange, ...props }: any) => JSX.Element;
 export default SelectResource;

package/es/components/productCard/components/Time/components/SelectResource/index.js

@@ -1,15 +1,21 @@
+var _excluded = ["lists", "value", "onChange"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useCallback, useEffect, useState } from 'react';
+import AlertTriangle from '@pisell/icon/es/AlertTriangle';
 import { Select } from 'antd';
 var SelectResource = function SelectResource(_ref) {
   var lists = _ref.lists,
     value = _ref.value,
-    _onChange = _ref.onChange;
+    _onChange = _ref.onChange,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectedValue = _useState2[0],
@@ -28,10 +34,21 @@ var SelectResource = function SelectResource(_ref) {
    */
   var renderOptions = useCallback(function () {
     return (lists || []).map(function (d) {
-      return /*#__PURE__*/React.createElement(Select.Option, {
+      return /*#__PURE__*/React.createElement(Select.Option, _extends({
         value: d.id,
         key: d.id
-      }, d['label']);
+      }, d || {}), /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: '8px'
+        }
+      }, /*#__PURE__*/React.createElement("span", null, d['label']), d !== null && d !== void 0 && d.isError ? /*#__PURE__*/React.createElement(AlertTriangle, {
+        style: {
+          color: '#b42318',
+          cursor: 'pointer'
+        }
+      }) : null));
     });
   }, [lists]);
   return /*#__PURE__*/React.createElement(Select, {

package/es/components/productCard/components/Time/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, }: any) => JSX.Element | null;
+declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, onAddHolder, }: any) => JSX.Element | null;
 export default Time;

package/es/components/productCard/components/Time/index.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { getServiceTime } from "../../utils";
 import Divider from "../Divider";
 import Like from "./components/Like";
@@ -20,7 +20,8 @@ var Time = function Time(_ref) {
     changeResource = _ref.changeResource,
     changeHolder = _ref.changeHolder,
     isShowChangeHolder = _ref.isShowChangeHolder,
-    holderMode = _ref.holderMode;
+    holderMode = _ref.holderMode,
+    onAddHolder = _ref.onAddHolder;
   var start_date = item.start_date,
     end_date = item.end_date,
     holder_title = item.holder_title,
@@ -30,10 +31,9 @@ var Time = function Time(_ref) {
     resources = item.resources,
     is_hide_like = item.is_hide_like,
     holder_id = item.holder_id,
-    holders = item.holders;
-  var isShow = useMemo(function () {
-    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name || isShowChangeResource;
-  }, [start_date, isShowHolder, holder_title, resource_id]);
+    holders = item.holders,
+    multiResources = item.multiResources,
+    isShowAddHolderButton = item.isShowAddHolderButton;
   var holderCom = useMemo(function () {
     if (!isShowHolder) return null;
 
@@ -43,7 +43,9 @@ var Time = function Time(_ref) {
         lists: holders,
         value: holder_id,
         onChange: changeHolder,
-        holderMode: holderMode
+        holderMode: holderMode,
+        isShowAddHolderButton: isShowAddHolderButton,
+        onAddHolder: onAddHolder
       });
     }
     if (holder_title) {
@@ -51,31 +53,58 @@ var Time = function Time(_ref) {
         className: "".concat(prefix, "product-holder-wrap")
       }, holder_title);
     }
-  }, [isShowHolder, holder_id, holder_title, holderMode, holders]);
+  }, [isShowHolder, holder_id, holder_title, holderMode, holders, isShowAddHolderButton]);
+  var likeCom = useCallback(function (status, item) {
+    return /*#__PURE__*/React.createElement(Like, {
+      style: {
+        marginRight: 4
+      },
+      status: status,
+      onLike: function onLike(e) {
+        _onLike(_objectSpread(_objectSpread({}, item), {}, {
+          like_status: e
+        }));
+      }
+    });
+  }, []);
+  var resourceCom = useCallback(function (item) {
+    if (!isShowChangeResource) {
+      return item === null || item === void 0 ? void 0 : item.name;
+    }
+    return /*#__PURE__*/React.createElement(SelectResource, {
+      lists: item === null || item === void 0 ? void 0 : item.lists,
+      value: item === null || item === void 0 ? void 0 : item.id,
+      allowClear: item === null || item === void 0 ? void 0 : item.allowClear,
+      onChange: changeResource
+    });
+  }, []);
+  var likeAndResourceCom = useMemo(function () {
+    if ((multiResources === null || multiResources === void 0 ? void 0 : multiResources.length) > 0) {
+      return multiResources.map(function (resourceItem) {
+        return /*#__PURE__*/React.createElement("div", {
+          key: resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.id
+        }, resourceItem !== null && resourceItem !== void 0 && resourceItem.id && !is_hide_like ? /*#__PURE__*/React.createElement("div", {
+          className: "".concat(prefix, "product-card-like-wrap")
+        }, likeCom(resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.status, resourceItem)) : null, resourceCom(resourceItem));
+      });
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, resource_id && !is_hide_like ? /*#__PURE__*/React.createElement("div", {
+      className: "".concat(prefix, "product-card-like-wrap")
+    }, likeCom(like_status, item)) : null, resourceCom({
+      name: relation_form_name,
+      id: resource_id,
+      lists: resources
+    }));
+  }, [multiResources, resource_id, resources, relation_form_name, is_hide_like]);
+  var isShow = useMemo(function () {
+    return start_date && end_date || holderCom || likeAndResourceCom;
+  }, [start_date, holderCom, likeAndResourceCom]);
   return isShow ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-time-wrap")
   }, start_date && end_date ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-date")
-  }, getServiceTime(item, start_date)) : null, holderCom, isShowChangeResource && (start_date && end_date || isShowHolder && holder_title) ? /*#__PURE__*/React.createElement(Divider, {
-    type: "inside"
-  }) : null, resource_id || relation_form_name || isShowChangeResource ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefix, "product-technician ").concat(isShowChangeResource ? 'pisell-lowcode-change-resource' : '')
-  }, resource_id && !is_hide_like ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefix, "product-card-like-wrap")
-  }, /*#__PURE__*/React.createElement(Like, {
-    style: {
-      marginRight: 4
-    },
-    status: like_status,
-    onLike: function onLike(e) {
-      _onLike(_objectSpread(_objectSpread({}, item), {}, {
-        like_status: e
-      }));
-    }
-  })) : null, isShowChangeResource ? /*#__PURE__*/React.createElement(SelectResource, {
-    lists: resources,
-    value: resource_id,
-    onChange: changeResource
-  }) : relation_form_name) : null)) : null;
+  }, getServiceTime(item, start_date)) : null, holderCom, likeAndResourceCom ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefix, "product-technician ").concat(isShowChangeResource ? 'pisell-lowcode-change-resource' : '', " ").concat((multiResources === null || multiResources === void 0 ? void 0 : multiResources.length) > 0 ? 'pisell-lowcode-multi-resources' : '')
+  }, likeAndResourceCom) : null)) : null;
 };
 export default Time;

package/es/components/productCard/components/Time/index.less

@@ -33,6 +33,18 @@
     align-items: center;
   }
 
+  &-multi-resources {
+    flex-direction: column;
+    align-items: start !important;
+    > div {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      width: 100%;
+    }
+  }
+
   &-product-card-like-wrap {
     display: flex;
     justify-content: center;

package/es/components/productCard/index.js

@@ -122,7 +122,8 @@ var ProductCard = function ProductCard(props) {
       return _onLike === null || _onLike === void 0 ? void 0 : _onLike(item);
     },
     changeResource: onChangeResource,
-    changeHolder: onChangeHolder
+    changeHolder: onChangeHolder,
+    onAddHolder: other === null || other === void 0 ? void 0 : other.onAddHolder
   }), /*#__PURE__*/React.createElement(Packages, {
     item: dataSource,
     isShowPackageNote: isShowPackageNote

package/es/components/productCard/utils.js

@@ -79,8 +79,8 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
 
   // 是否显示时间
   if (item !== null && item !== void 0 && item.show_time) {
-    startDate = dayjs("".concat(item === null || item === void 0 ? void 0 : item.start_date, " ").concat(item === null || item === void 0 ? void 0 : item.start_time));
-    endDate = dayjs("".concat(item === null || item === void 0 ? void 0 : item.end_date, " ").concat(item === null || item === void 0 ? void 0 : item.end_time));
+    startDate = dayjs(item !== null && item !== void 0 && item.start_time ? "".concat(item === null || item === void 0 ? void 0 : item.start_date, " ").concat(item === null || item === void 0 ? void 0 : item.start_time) : startDate.format('YYYY-MM-DD HH:mm'));
+    endDate = dayjs(item !== null && item !== void 0 && item.end_time ? "".concat(item === null || item === void 0 ? void 0 : item.end_date, " ").concat(item === null || item === void 0 ? void 0 : item.end_time) : endDate.format('YYYY-MM-DD HH:mm'));
   }
 
   // 显示时长分钟

package/lib/components/productCard/components/MultiDay/index.d.ts

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

package/lib/components/productCard/components/Time/components/SelectHolder/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const SelectHolder: ({ lists, value, onChange, holderMode }: any) => JSX.Element;
+declare const SelectHolder: ({ lists, value, onChange, holderMode, isShowAddHolderButton, onAddHolder, }: any) => JSX.Element;
 export default SelectHolder;

package/lib/components/productCard/components/Time/components/SelectHolder/index.js

@@ -34,17 +34,26 @@ __export(SelectHolder_exports, {
 module.exports = __toCommonJS(SelectHolder_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
+var import_icons = require("@ant-design/icons");
 var import_index = require("./index.less");
-var SelectHolder = ({ lists, value, onChange, holderMode }) => {
+var SelectHolder = ({
+  lists,
+  value,
+  onChange,
+  holderMode,
+  isShowAddHolderButton,
+  onAddHolder
+}) => {
   const [selectedValue, setSelectedValue] = (0, import_react.useState)();
   (0, import_react.useEffect)(() => {
     setSelectedValue(value);
   }, [value]);
-  const renderOptions = (0, import_react.useCallback)(() => {
-    return (lists || []).map((d) => {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d.id, key: d.id }, d["label"]);
-    });
-  }, [lists]);
+  const addItem = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    onAddHolder();
+  };
+  console.log(lists, "select-holder");
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-product-card-select-holder" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Select,
     {
@@ -56,9 +65,22 @@ var SelectHolder = ({ lists, value, onChange, holderMode }) => {
         setSelectedValue(val);
         const item = lists.find((d) => d.id === val);
         onChange(item);
-      }
-    },
-    renderOptions()
+      },
+      options: lists.map((item) => ({
+        label: item == null ? void 0 : item.label,
+        value: item == null ? void 0 : item.id
+      })),
+      dropdownRender: (menu) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, menu, isShowAddHolderButton ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { style: { margin: "8px 0" } }), /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          type: "text",
+          icon: /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null),
+          onClick: addItem,
+          style: { width: "100%" }
+        },
+        "Add item"
+      )) : null)
+    }
   ));
 };
 var SelectHolder_default = SelectHolder;

package/lib/components/productCard/components/Time/components/SelectResource/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare const SelectResource: ({ lists, value, onChange }: any) => JSX.Element;
+declare const SelectResource: ({ lists, value, onChange, ...props }: any) => JSX.Element;
 export default SelectResource;

package/lib/components/productCard/components/Time/components/SelectResource/index.js

@@ -33,15 +33,16 @@ __export(SelectResource_exports, {
 });
 module.exports = __toCommonJS(SelectResource_exports);
 var import_react = __toESM(require("react"));
+var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
 var import_antd = require("antd");
-var SelectResource = ({ lists, value, onChange }) => {
+var SelectResource = ({ lists, value, onChange, ...props }) => {
   const [selectedValue, setSelectedValue] = (0, import_react.useState)();
   (0, import_react.useEffect)(() => {
     setSelectedValue(value);
   }, [value]);
   const renderOptions = (0, import_react.useCallback)(() => {
     return (lists || []).map((d) => {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d.id, key: d.id }, d["label"]);
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d.id, key: d.id, ...d || {} }, /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: "8px" } }, /* @__PURE__ */ import_react.default.createElement("span", null, d["label"]), (d == null ? void 0 : d.isError) ? /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { style: { color: "#b42318", cursor: "pointer" } }) : null));
     });
   }, [lists]);
   return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/productCard/components/Time/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, }: any) => JSX.Element | null;
+declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, onAddHolder, }: any) => JSX.Element | null;
 export default Time;

package/lib/components/productCard/components/Time/index.js

@@ -48,7 +48,8 @@ var Time = ({
   changeResource,
   changeHolder,
   isShowChangeHolder,
-  holderMode
+  holderMode,
+  onAddHolder
 }) => {
   const {
     start_date,
@@ -60,11 +61,11 @@ var Time = ({
     resources,
     is_hide_like,
     holder_id,
-    holders
+    holders,
+    // 多个资源数据
+    multiResources,
+    isShowAddHolderButton
   } = item;
-  const isShow = (0, import_react.useMemo)(() => {
-    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name || isShowChangeResource;
-  }, [start_date, isShowHolder, holder_title, resource_id]);
   const holderCom = (0, import_react.useMemo)(() => {
     if (!isShowHolder) return null;
     if (isShowChangeHolder) {
@@ -74,40 +75,79 @@ var Time = ({
           lists: holders,
           value: holder_id,
           onChange: changeHolder,
-          holderMode
+          holderMode,
+          isShowAddHolderButton,
+          onAddHolder
         }
       );
     }
     if (holder_title) {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-holder-wrap` }, holder_title);
     }
-  }, [isShowHolder, holder_id, holder_title, holderMode, holders]);
-  return isShow ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-time-wrap` }, start_date && end_date ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-date` }, (0, import_utils.getServiceTime)(item, start_date)) : null, holderCom, isShowChangeResource && (start_date && end_date || isShowHolder && holder_title) ? /* @__PURE__ */ import_react.default.createElement(import_Divider.default, { type: "inside" }) : null, resource_id || relation_form_name || isShowChangeResource ? /* @__PURE__ */ import_react.default.createElement(
-    "div",
-    {
-      className: `${prefix}product-technician ${isShowChangeResource ? "pisell-lowcode-change-resource" : ""}`
-    },
-    resource_id && !is_hide_like ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-card-like-wrap` }, /* @__PURE__ */ import_react.default.createElement(
+  }, [
+    isShowHolder,
+    holder_id,
+    holder_title,
+    holderMode,
+    holders,
+    isShowAddHolderButton
+  ]);
+  const likeCom = (0, import_react.useCallback)((status, item2) => {
+    return /* @__PURE__ */ import_react.default.createElement(
       import_Like.default,
       {
         style: { marginRight: 4 },
-        status: like_status,
+        status,
         onLike: (e) => {
           onLike({
-            ...item,
+            ...item2,
             like_status: e
           });
         }
       }
-    )) : null,
-    isShowChangeResource ? /* @__PURE__ */ import_react.default.createElement(
+    );
+  }, []);
+  const resourceCom = (0, import_react.useCallback)((item2) => {
+    if (!isShowChangeResource) {
+      return item2 == null ? void 0 : item2.name;
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
       import_SelectResource.default,
       {
-        lists: resources,
-        value: resource_id,
+        lists: item2 == null ? void 0 : item2.lists,
+        value: item2 == null ? void 0 : item2.id,
+        allowClear: item2 == null ? void 0 : item2.allowClear,
         onChange: changeResource
       }
-    ) : relation_form_name
+    );
+  }, []);
+  const likeAndResourceCom = (0, import_react.useMemo)(() => {
+    if ((multiResources == null ? void 0 : multiResources.length) > 0) {
+      return multiResources.map((resourceItem) => {
+        return /* @__PURE__ */ import_react.default.createElement("div", { key: resourceItem == null ? void 0 : resourceItem.id }, (resourceItem == null ? void 0 : resourceItem.id) && !is_hide_like ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-card-like-wrap` }, likeCom(resourceItem == null ? void 0 : resourceItem.status, resourceItem)) : null, resourceCom(resourceItem));
+      });
+    }
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, resource_id && !is_hide_like ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-card-like-wrap` }, likeCom(like_status, item)) : null, resourceCom({
+      name: relation_form_name,
+      id: resource_id,
+      lists: resources
+    }));
+  }, [
+    multiResources,
+    resource_id,
+    resources,
+    relation_form_name,
+    is_hide_like
+  ]);
+  const isShow = (0, import_react.useMemo)(() => {
+    return start_date && end_date || holderCom || likeAndResourceCom;
+  }, [start_date, holderCom, likeAndResourceCom]);
+  return isShow ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-time-wrap` }, start_date && end_date ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-date` }, (0, import_utils.getServiceTime)(item, start_date)) : null, holderCom, likeAndResourceCom ? /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: `${prefix}product-technician ${isShowChangeResource ? "pisell-lowcode-change-resource" : ""} ${(multiResources == null ? void 0 : multiResources.length) > 0 ? "pisell-lowcode-multi-resources" : ""}`
+    },
+    likeAndResourceCom
   ) : null)) : null;
 };
 var Time_default = Time;

package/lib/components/productCard/components/Time/index.less

@@ -33,6 +33,18 @@
     align-items: center;
   }
 
+  &-multi-resources {
+    flex-direction: column;
+    align-items: start !important;
+    > div {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      width: 100%;
+    }
+  }
+
   &-product-card-like-wrap {
     display: flex;
     justify-content: center;

package/lib/components/productCard/index.js

@@ -140,7 +140,8 @@ var ProductCard = (props) => {
             holderMode: other == null ? void 0 : other.holderMode,
             onLike: (item) => onLike == null ? void 0 : onLike(item),
             changeResource: onChangeResource,
-            changeHolder: onChangeHolder
+            changeHolder: onChangeHolder,
+            onAddHolder: other == null ? void 0 : other.onAddHolder
           }
         ),
         /* @__PURE__ */ import_react.default.createElement(import_Packages.default, { item: dataSource, isShowPackageNote }),

package/lib/components/productCard/utils.js

@@ -80,8 +80,8 @@ var getServiceTime = (item, currentDate) => {
     _format = isEn2 ? (_c = item == null ? void 0 : item.format) == null ? void 0 : _c[0] : (_d = item == null ? void 0 : item.format) == null ? void 0 : _d[1];
   }
   if (item == null ? void 0 : item.show_time) {
-    startDate = (0, import_dayjs.default)(`${item == null ? void 0 : item.start_date} ${item == null ? void 0 : item.start_time}`);
-    endDate = (0, import_dayjs.default)(`${item == null ? void 0 : item.end_date} ${item == null ? void 0 : item.end_time}`);
+    startDate = (0, import_dayjs.default)((item == null ? void 0 : item.start_time) ? `${item == null ? void 0 : item.start_date} ${item == null ? void 0 : item.start_time}` : startDate.format("YYYY-MM-DD HH:mm"));
+    endDate = (0, import_dayjs.default)((item == null ? void 0 : item.end_time) ? `${item == null ? void 0 : item.end_date} ${item == null ? void 0 : item.end_time}` : endDate.format("YYYY-MM-DD HH:mm"));
   }
   if ((item == null ? void 0 : item.duration_type) === "minutes") {
     diffInDays = endDate.diff(startDate, "minute");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "3.2.27",
+  "version": "3.2.29",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -72,8 +72,8 @@
     "react-barcode": "^1.5.3",
     "vod-js-sdk-v6": "^1.4.11",
     "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42"
+    "@pisell/utils": "1.0.42",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

@@ -1,4 +0,0 @@
-import { AppVersionControlProps } from './types';
-import './index.less';
-declare const AppVersionControl: (props: AppVersionControlProps) => JSX.Element;
-export default AppVersionControl;