@pisell/materials 3.2.28 → 3.2.29

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

@@ -4,7 +4,7 @@ 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 React, { useEffect, useState } from 'react';
 import { Select, Divider, Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import "./index.less";
@@ -23,23 +23,6 @@ var SelectHolder = function SelectHolder(_ref) {
     setSelectedValue(value);
   }, [value]);
 
-  /**
-   * @title: 渲染下拉框
-   * @description:
-   * @param {*} useCallback
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-04-11 14:57
-   */
-  var renderOptions = useCallback(function () {
-    return (lists || []).map(function (d) {
-      return /*#__PURE__*/React.createElement(Select.Option, {
-        value: d.id,
-        key: d.id
-      }, d['label']);
-    });
-  }, [lists]);
-
   /**
    * @title: 点击添加holder事件
    * @description:
@@ -53,6 +36,7 @@ var SelectHolder = function SelectHolder(_ref) {
     e.stopPropagation();
     onAddHolder();
   };
+  console.log(lists, 'select-holder');
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-product-card-select-holder"
   }, /*#__PURE__*/React.createElement(Select, {

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

@@ -34,9 +34,6 @@ var Time = function Time(_ref) {
     holders = item.holders,
     multiResources = item.multiResources,
     isShowAddHolderButton = item.isShowAddHolderButton;
-  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]);
   var holderCom = useMemo(function () {
     if (!isShowHolder) return null;
 
@@ -47,7 +44,7 @@ var Time = function Time(_ref) {
         value: holder_id,
         onChange: changeHolder,
         holderMode: holderMode,
-        isShowAddHolderButton: true,
+        isShowAddHolderButton: isShowAddHolderButton,
         onAddHolder: onAddHolder
       });
     }
@@ -99,13 +96,14 @@ var Time = function Time(_ref) {
       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, likeAndResourceCom ? /*#__PURE__*/React.createElement("div", {
+  }, 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;
 };

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

@@ -48,16 +48,12 @@ var SelectHolder = ({
   (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,
     {

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

@@ -66,9 +66,6 @@ var Time = ({
     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) {
@@ -79,7 +76,7 @@ var Time = ({
           value: holder_id,
           onChange: changeHolder,
           holderMode,
-          isShowAddHolderButton: true,
+          isShowAddHolderButton,
           onAddHolder
         }
       );
@@ -142,7 +139,10 @@ var Time = ({
     relation_form_name,
     is_hide_like
   ]);
-  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, likeAndResourceCom ? /* @__PURE__ */ import_react.default.createElement(
+  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" : ""}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "3.2.28",
+  "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",