@pisell/materials 3.2.21 → 3.2.23

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "saas" | "xzero";
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/es/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -19,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "saas" | "xzero";
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -59,13 +59,11 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -78,14 +76,14 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "saas" | "xzero";
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -97,5 +95,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) => JSX.Element) | import("react").FC<any> | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/es/components/pisellGoodPassCard/index.js

@@ -12,8 +12,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { Checkbox, Divider, Typography } from 'antd';
-import { locales } from '@pisell/utils';
 import { PisellText, PisellCard, PisellModal } from "../../index";
+import { getText } from "../../locales";
 import useEngineContext from "../../hooks/useEngineContext";
 import "./index.less";
 var clsPrefix = 'pisell-good-pass-card';
@@ -90,12 +90,12 @@ var index = function index(props) {
     var list = dataSource.length > 3 ? dataSource.slice(0, 3) : dataSource;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "".concat(clsPrefix, "-header")
-    }, /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.text.goodpass.product-vouchers')), /*#__PURE__*/React.createElement(Typography.Text, {
+    }, /*#__PURE__*/React.createElement("div", null, getText('pisell2.text.goodpass.product-vouchers')), /*#__PURE__*/React.createElement(Typography.Text, {
       underline: true,
       onClick: function onClick() {
         return setShowModal(true);
       }
-    }, locales.getText('pisell2.text.goodpass.view-more'))), /*#__PURE__*/React.createElement(Divider, {
+    }, getText('pisell2.text.goodpass.view-more'))), /*#__PURE__*/React.createElement(Divider, {
       style: {
         margin: 4
       }

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

@@ -6,7 +6,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useEffect, useState } from 'react';
 import { Select } from 'antd';
-import Divider from "../../../Divider";
 var SelectResource = function SelectResource(_ref) {
   var lists = _ref.lists,
     value = _ref.value,
@@ -35,9 +34,8 @@ var SelectResource = function SelectResource(_ref) {
       }, d['label']);
     });
   }, [lists]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(Select, {
+  return /*#__PURE__*/React.createElement(Select, {
     size: "large",
-    allowClear: true,
     showSearch: true,
     style: {
       flex: 1
@@ -45,8 +43,11 @@ var SelectResource = function SelectResource(_ref) {
     value: selectedValue,
     onChange: function onChange(val) {
       setSelectedValue(val);
-      _onChange(val);
+      var item = lists.find(function (d) {
+        return d.id === val;
+      });
+      _onChange(item);
     }
-  }, renderOptions()));
+  }, renderOptions());
 };
 export default SelectResource;

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

@@ -26,15 +26,18 @@ var Time = function Time(_ref) {
     resources = item.resources,
     is_hide_like = item.is_hide_like;
   var isShow = useMemo(function () {
-    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name;
+    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name || isShowChangeResource;
   }, [start_date, isShowHolder, holder_title, resource_id]);
+  console.log('isShowChangeResource33', resources, isShowChangeResource);
   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, isShowHolder && holder_title ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-holder-wrap")
-  }, holder_title) : null, resource_id || relation_form_name || isShowChangeResource ? /*#__PURE__*/React.createElement("div", {
+  }, holder_title) : null, 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")

package/es/components/productCard/index.js

@@ -118,11 +118,7 @@ var ProductCard = function ProductCard(props) {
     onLike: function onLike(item) {
       return _onLike === null || _onLike === void 0 ? void 0 : _onLike(item);
     },
-    changeResource: function changeResource(e) {
-      onChangeResource(_objectSpread(_objectSpread({}, dataSource), {}, {
-        resource_id: e
-      }));
-    }
+    changeResource: onChangeResource
   }), /*#__PURE__*/React.createElement(Packages, {
     item: dataSource,
     isShowPackageNote: isShowPackageNote

package/es/components/productCard/utils.js

@@ -68,7 +68,7 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   dayjs.locale(localeTypes[locale]);
   var startDate = dayjs(item === null || item === void 0 ? void 0 : item.start_date);
   var endDate = dayjs(item === null || item === void 0 ? void 0 : item.end_date);
-  var diffInDays = (item === null || item === void 0 ? void 0 : item.custom_day_count) || endDate.diff(startDate, (item === null || item === void 0 ? void 0 : item.duration_type) || 'day');
+  var diffInDays = (item === null || item === void 0 ? void 0 : item.custom_day_count) || endDate.diff(startDate, 'day');
   var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
 
   // 是否自定义格式
@@ -82,6 +82,11 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
     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));
   }
+
+  // 显示时长分钟
+  if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'minutes') {
+    diffInDays = endDate.diff(startDate, 'minute');
+  }
   var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
 
   // 自定义文案
@@ -95,5 +100,5 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   };
   text = (textTypes === null || textTypes === void 0 ? void 0 : textTypes[item === null || item === void 0 ? void 0 : item.duration_type]) || text;
   var duration = "".concat(diffInDays).concat(text);
-  return "".concat(date, " ").concat(diffInDays ? "(".concat(duration, ")") : '');
+  return "".concat(date, " (").concat(duration, ")");
 };

package/es/components/table/Table/fields/index.d.ts

@@ -197,12 +197,12 @@ export declare const fieldList: ({
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: string;
+    default_value: boolean;
 } | {
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: boolean;
+    default_value: string;
 } | {
     field_icon: string;
     field_name: string;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "saas" | "xzero";
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/lib/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -19,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "saas" | "xzero";
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -59,13 +59,11 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -78,14 +76,14 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "saas" | "xzero";
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -97,5 +95,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) => JSX.Element) | import("react").FC<any> | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/lib/components/pisellGoodPassCard/index.js

@@ -34,8 +34,8 @@ __export(pisellGoodPassCard_exports, {
 module.exports = __toCommonJS(pisellGoodPassCard_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
-var import_utils = require("@pisell/utils");
 var import__ = require("../../index");
+var import_locales = require("../../locales");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var clsPrefix = "pisell-good-pass-card";
@@ -90,7 +90,7 @@ var index = (props) => {
   };
   const renderMixedMode = () => {
     const list = dataSource.length > 3 ? dataSource.slice(0, 3) : dataSource;
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: `${clsPrefix}-header` }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.goodpass.product-vouchers")), /* @__PURE__ */ import_react.default.createElement(import_antd.Typography.Text, { underline: true, onClick: () => setShowModal(true) }, import_utils.locales.getText("pisell2.text.goodpass.view-more"))), /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { style: { margin: 4 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: `${clsPrefix}-body` }, list.map(renderVoucherItem)));
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: `${clsPrefix}-header` }, /* @__PURE__ */ import_react.default.createElement("div", null, (0, import_locales.getText)("pisell2.text.goodpass.product-vouchers")), /* @__PURE__ */ import_react.default.createElement(import_antd.Typography.Text, { underline: true, onClick: () => setShowModal(true) }, (0, import_locales.getText)("pisell2.text.goodpass.view-more"))), /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { style: { margin: 4 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: `${clsPrefix}-body` }, list.map(renderVoucherItem)));
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderModal(), /* @__PURE__ */ import_react.default.createElement(
     import__.PisellCard,

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

@@ -34,7 +34,6 @@ __export(SelectResource_exports, {
 module.exports = __toCommonJS(SelectResource_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
-var import_Divider = __toESM(require("../../../Divider"));
 var SelectResource = ({ lists, value, onChange }) => {
   const [selectedValue, setSelectedValue] = (0, import_react.useState)();
   (0, import_react.useEffect)(() => {
@@ -45,20 +44,20 @@ var SelectResource = ({ lists, value, onChange }) => {
       return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d.id, key: d.id }, d["label"]);
     });
   }, [lists]);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Select,
     {
       size: "large",
-      allowClear: true,
       showSearch: true,
       style: { flex: 1 },
       value: selectedValue,
       onChange: (val) => {
         setSelectedValue(val);
-        onChange(val);
+        const item = lists.find((d) => d.id === val);
+        onChange(item);
       }
     },
     renderOptions()
-  ));
+  );
 };
 var SelectResource_default = SelectResource;

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

@@ -57,9 +57,10 @@ var Time = ({
     is_hide_like
   } = item;
   const isShow = (0, import_react.useMemo)(() => {
-    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name;
+    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name || isShowChangeResource;
   }, [start_date, isShowHolder, holder_title, resource_id]);
-  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, isShowHolder && holder_title ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-holder-wrap` }, holder_title) : null, resource_id || relation_form_name || isShowChangeResource ? /* @__PURE__ */ import_react.default.createElement(
+  console.log("isShowChangeResource33", resources, isShowChangeResource);
+  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, isShowHolder && holder_title ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-holder-wrap` }, holder_title) : null, 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" : ""}`

package/lib/components/productCard/index.js

@@ -136,12 +136,7 @@ var ProductCard = (props) => {
             isShowHolder,
             isShowChangeResource: other == null ? void 0 : other.isShowChangeResource,
             onLike: (item) => onLike == null ? void 0 : onLike(item),
-            changeResource: (e) => {
-              onChangeResource({
-                ...dataSource,
-                resource_id: e
-              });
-            }
+            changeResource: onChangeResource
           }
         ),
         /* @__PURE__ */ import_react.default.createElement(import_Packages.default, { item: dataSource, isShowPackageNote }),

package/lib/components/productCard/utils.js

@@ -74,7 +74,7 @@ var getServiceTime = (item, currentDate) => {
   import_dayjs.default.locale(localeTypes[locale]);
   let startDate = (0, import_dayjs.default)(item == null ? void 0 : item.start_date);
   let endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
-  const diffInDays = (item == null ? void 0 : item.custom_day_count) || endDate.diff(startDate, (item == null ? void 0 : item.duration_type) || "day");
+  let diffInDays = (item == null ? void 0 : item.custom_day_count) || endDate.diff(startDate, "day");
   let _format = isEn2 ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
   if ((item == null ? void 0 : item.hasOwnProperty("format")) && ((_b = item == null ? void 0 : item.format) == null ? void 0 : _b.length) > 0) {
     _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];
@@ -83,6 +83,9 @@ var getServiceTime = (item, currentDate) => {
     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}`);
   }
+  if ((item == null ? void 0 : item.duration_type) === "minutes") {
+    diffInDays = endDate.diff(startDate, "minute");
+  }
   const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
   let text = import_utils.locales.getText("pisell2.product.card.day")(diffInDays);
   if (item == null ? void 0 : item.custom_day_count) {
@@ -94,7 +97,7 @@ var getServiceTime = (item, currentDate) => {
   };
   text = (textTypes == null ? void 0 : textTypes[item == null ? void 0 : item.duration_type]) || text;
   let duration = `${diffInDays}${text}`;
-  return `${date} ${diffInDays ? `(${duration})` : ""}`;
+  return `${date} (${duration})`;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/table/Table/fields/index.d.ts

@@ -197,12 +197,12 @@ export declare const fieldList: ({
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: string;
+    default_value: boolean;
 } | {
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: boolean;
+    default_value: string;
 } | {
     field_icon: string;
     field_name: string;

package/package.json

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

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

@@ -1,38 +0,0 @@
-import { DraggableAttributes } from "@dnd-kit/core";
-import { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
-import React from "react";
-import { PointerActivationConstraint } from "@dnd-kit/core/dist/sensors/pointer/AbstractPointerSensor";
-declare type IdType = string | number;
-export interface Props<T> {
-    list?: T[];
-    onChange?: (list: T[]) => void;
-    rowKey: IdType | ((val: T) => IdType);
-    activationConstraint?: PointerActivationConstraint;
-    children: (params: {
-        item: T;
-        index: number;
-        style: React.CSSProperties;
-        props: any;
-        setActivatorNodeRef: (element: HTMLElement | null) => void;
-        listeners: SyntheticListenerMap;
-        attributes: DraggableAttributes;
-    }) => React.ReactElement<HTMLElement>;
-}
-export default function Sortable<T extends Record<string, any>>({ list, onChange, rowKey, children, activationConstraint, }: Props<T>): JSX.Element;
-export interface SortableItemProps<T> {
-    id: number;
-    index: number;
-    disabled?: boolean;
-    children: (params: {
-        item: T;
-        index: number;
-        style: React.CSSProperties;
-        props: any;
-        setActivatorNodeRef: (element: HTMLElement | null) => void;
-        listeners: SyntheticListenerMap;
-        attributes: DraggableAttributes;
-    }) => React.ReactElement<HTMLElement>;
-    item: T;
-}
-export declare function SortableItem<T>({ id, index, item, children, disabled, }: SortableItemProps<T>): React.ReactElement<HTMLElement, string | React.JSXElementConstructor<any>>;
-export {};

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;

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

@@ -1,24 +0,0 @@
-/// <reference types="react" />
-export interface Version {
-    id: string;
-    label: string;
-    value: string;
-    name: string;
-    status: 'live' | 'draft' | 'deprecated';
-    version: string;
-    avatar?: string;
-}
-export interface AppVersionControlProps {
-    value: string;
-    versions: Version[];
-    onVersionChange: (value: string, version: Version) => void;
-    onCreateVersion: (detail: {
-        version: string;
-        baseVersion: string;
-    }) => Promise<boolean | undefined>;
-    onPromoteToLive: (value: string, version: Version) => Promise<boolean | undefined>;
-    allowPublish?: boolean;
-    allowCreate?: boolean;
-    className?: string;
-    style?: React.CSSProperties;
-}

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

@@ -1,13 +0,0 @@
-/**
- * 比较两个版本号
- * @param version1 版本号1
- * @param version2 版本号2
- * @returns 如果version1大于version2返回1，相等返回0，小于返回-1
- */
-export declare const compareVersions: (version1: string, version2: string) => number;
-/**
- * 从版本号列表中获取最大版本号
- * @param versions 版本号列表
- * @returns 最大的版本号，如果列表为空返回undefined
- */
-export declare const getMaxVersion: (versions: string[]) => string | undefined;

package/es/components/auto-complete/index.d.ts

@@ -1,2 +0,0 @@
-declare const AutoComplete: any;
-export default AutoComplete;

package/es/components/auto-complete-number/index.d.ts

@@ -1,9 +0,0 @@
-import { AutoCompleteProps, InputNumberProps } from "antd";
-interface AutoCompleteNumberProps {
-    autoCompleteProps: AutoCompleteProps;
-    inputNumberProps: InputNumberProps;
-    value?: any;
-    onChange?: any;
-}
-declare const AutoCompleteNumber: (props: AutoCompleteNumberProps) => JSX.Element;
-export default AutoCompleteNumber;

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

@@ -1,7 +0,0 @@
-import { BadgeProps as OriginalBadgeprops } from 'antd';
-import './index.less';
-export interface Badgeprops extends OriginalBadgeprops {
-    styleType: 'default' | 'warning';
-}
-declare const Badge: (props: any) => JSX.Element;
-export default Badge;

package/es/components/batch-editor/fields/Image/index.d.ts

@@ -1,7 +0,0 @@
-import React from "react";
-export interface ImageProps extends React.ComponentPropsWithoutRef<"img"> {
-    value?: string;
-}
-import "./index.less";
-declare const Image: (props: ImageProps) => JSX.Element | null;
-export default Image;

package/es/components/batch-editor/fields/Price/index.d.ts

@@ -1,7 +0,0 @@
-import React from "react";
-import { InputNumberProps } from "antd";
-export interface PriceProps extends InputNumberProps {
-    symbol: string;
-}
-declare const Price: React.FC<PriceProps>;
-export default Price;

package/es/components/batch-editor/fields/Text/index.d.ts

@@ -1,6 +0,0 @@
-import React from "react";
-export interface TextProps extends React.HTMLAttributes<HTMLDivElement> {
-    children: React.ReactNode;
-}
-declare const Text: (props: TextProps) => JSX.Element;
-export default Text;

package/es/components/batch-editor/fields/index.d.ts

@@ -1,6 +0,0 @@
-declare const _default: {
-    price: import("react").FC<import("./Price").PriceProps>;
-    image: (props: import("./Image").ImageProps) => JSX.Element | null;
-    text: (props: import("./Text").TextProps) => JSX.Element;
-};
-export default _default;

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

@@ -1,21 +0,0 @@
-import React from "react";
-import "./index.less";
-interface Option {
-    label: React.ReactNode;
-    value: string | number;
-}
-interface BrowserSelectProps extends Omit<React.DetailedHTMLProps<React.SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement>, 'value' | 'onChange'> {
-    options: Option[];
-    value?: string | number;
-    onChange?: (value: string | number, option: Option) => void;
-}
-/**
- * @title: 系统级别的下拉框
- * @description:
- * @param {BrowserSelectProps} props
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-01-30 16:43
- */
-declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
-export default BrowserSelect;