@pisell/materials 2.2.62 → 2.2.64

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

@@ -50,6 +50,7 @@ var SelectHolder = ({
   allowClear = false
 }) => {
   const [selectedValue, setSelectedValue] = (0, import_react.useState)();
+  const [open, setOpen] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     setSelectedValue(value);
   }, [value]);
@@ -57,13 +58,8 @@ var SelectHolder = ({
     e.preventDefault();
     e.stopPropagation();
     onAddHolder();
+    setOpen(false);
   };
-  console.log(
-    lists,
-    isShowAddHolderButton,
-    addHolderButtonText,
-    "select-holder"
-  );
   const isError = (0, import_react.useMemo)(() => {
     if (!selectedValue && isErrorHolder) return true;
   }, [selectedValue, isErrorHolder]);
@@ -75,6 +71,8 @@ var SelectHolder = ({
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Select,
       {
+        open,
+        onDropdownVisibleChange: setOpen,
         onClick: (e) => e.stopPropagation(),
         mode: holderMode,
         size: "large",
@@ -84,7 +82,7 @@ var SelectHolder = ({
         value: selectedValue,
         placeholder: import_utils.locales.getText(
           "pisell2.product.card.add.holder.placeholder"
-        )(""),
+        )(addHolderButtonText),
         onChange: (val) => {
           setSelectedValue(val);
           const item = lists.find((d) => d.id === val);

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

@@ -1,8 +1,6 @@
 .pisell-lowcode-product-card-select-holder {
   .pisell-lowcode-select {
-    min-width: 140px;
-    max-width: 100%;
-    width: auto;
+    width: 100%;
     .pisell-lowcode-select-selector {
       border-radius: 50px;
     }

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

@@ -67,25 +67,28 @@ var SelectResource = ({
       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]);
-  const handleChange = (0, import_react.useCallback)((val) => {
-    if (["multiple", "tags"].includes(resourceMode) && maxLength) {
-      if (value && value.length >= maxLength && val.length > value.length) {
-        return;
+  const handleChange = (0, import_react.useCallback)(
+    (val) => {
+      if (["multiple", "tags"].includes(resourceMode) && maxLength) {
+        if (value && value.length >= maxLength && val.length > value.length) {
+          return;
+        }
       }
-    }
-    setSelectedValue(val);
-    if (props.isParallelResource) {
-      const valueArray = (0, import_utils2.isArr)(val) ? val : [val];
-      return onChange({
-        value: valueArray,
-        options: valueArray.map((v) => resourceMap[v]),
-        resourceMode,
-        props
-      });
-    }
-    const item = resourceMap[val];
-    onChange(item);
-  }, [resourceMode, maxLength, value, onChange, props, resourceMap]);
+      setSelectedValue(val);
+      if (props.isParallelResource) {
+        const valueArray = (0, import_utils2.isArr)(val) ? val : [val];
+        return onChange({
+          value: valueArray,
+          options: valueArray.map((v) => resourceMap[v]),
+          resourceMode,
+          props
+        });
+      }
+      const item = resourceMap[val];
+      onChange(item);
+    },
+    [resourceMode, maxLength, value, onChange, props, resourceMap]
+  );
   const isError = (0, import_react.useMemo)(() => {
     if (!selectedValue && isErrorResource) return true;
   }, [selectedValue, isErrorResource]);
@@ -97,6 +100,7 @@ var SelectResource = ({
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Select,
       {
+        disabled: props.disabled,
         mode: resourceMode,
         size: "large",
         showSearch: true,
@@ -105,6 +109,9 @@ var SelectResource = ({
         onClick: (e) => e.stopPropagation(),
         style: { flex: 1 },
         value: selectedValue,
+        placeholder: import_utils.locales.getText(
+          "pisell2.product.card.add.holder.placeholder"
+        )(""),
         onChange: handleChange
       },
       renderOptions()

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

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

package/lib/components/productCard/index.js

@@ -74,7 +74,6 @@ var ProductCard = (props) => {
   const useOpenNoteRef = (0, import_react.useRef)();
   const locale = ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || localStorage.getItem("umi_locale");
   import_utils.locales.init(import_locales.default, locale || "en");
-  console.log(dataSource, isShowImage, isShowNote, "dataSource");
   const {
     image,
     bundle,

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

@@ -15,6 +15,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
@@ -32,6 +33,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
@@ -49,6 +51,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
 };
 export default _default;

package/lib/components/productCard/locales.js

@@ -38,7 +38,8 @@ var locales_default = {
     "pisell2.product.card.view-all": "View all",
     "pisell2.product.card.view-less": "View less",
     "pisell2.product.card.add.holder.button.text": (val) => `Add ${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `Please select ${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `Please select ${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}h` : ""}${hour > 0 && minute > 0 ? " " : ""}${minute > 0 ? `${minute}min` : ""}`
   },
   "zh-CN": {
     "pisell2.product.card.day": (val) => "天",
@@ -55,7 +56,8 @@ var locales_default = {
     "pisell2.product.card.view-all": "查看全部",
     "pisell2.product.card.view-less": "收起",
     "pisell2.product.card.add.holder.button.text": (val) => `添加${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `请选择${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `请选择${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小时` : ""}${minute > 0 ? `${minute}分钟` : ""}`
   },
   "zh-HK": {
     "pisell2.product.card.day": (val) => "天",
@@ -72,6 +74,7 @@ var locales_default = {
     "pisell2.product.card.view-all": "查看全部",
     "pisell2.product.card.view-less": "收起",
     "pisell2.product.card.add.holder.button.text": (val) => `添加${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `請選擇${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `請選擇${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小時` : ""}${minute > 0 ? `${minute}分鐘` : ""}`
   }
 };

package/lib/components/productCard/utils.js

@@ -97,9 +97,18 @@ var getServiceTime = (item, currentDate) => {
     }
     const startDateTime = `${startDate.format("YYYY-MM-DD")} ${startTime}`;
     const endDateTime = `${endDate.format("YYYY-MM-DD")} ${endTime}`;
-    const _duration = (0, import_dayjs.default)(endDateTime).diff((0, import_dayjs.default)(startDateTime), item == null ? void 0 : item.duration_type);
-    let text2 = (item == null ? void 0 : item.duration_type) === "days" ? import_utils.locales.getText("pisell2.product.card.day")(_duration) : import_utils.locales.getText("pisell2.product.card.minute")(_duration);
-    return `${dateTime} (${_duration}${text2})`;
+    let _duration = (0, import_dayjs.default)(endDateTime).diff((0, import_dayjs.default)(startDateTime), item == null ? void 0 : item.duration_type);
+    let durationText = "";
+    if ((item == null ? void 0 : item.duration_type) === "minutes") {
+      const hours = Math.floor(_duration / 60);
+      const minutes = _duration % 60;
+      durationText = import_utils.locales.getText("pisell2.product.card.hour.minute")(hours, minutes);
+    } else if ((item == null ? void 0 : item.duration_type) === "days") {
+      durationText = import_utils.locales.getText("pisell2.product.card.day")(_duration);
+    } else {
+      durationText = `${_duration}`;
+    }
+    return `${dateTime} (${durationText})`;
   }
   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) {

package/lib/components/qrcode/index.d.ts

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

package/lib/components/table/Actions/component/GallerySetting/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType, ModeType } from "../../../types";
 import "./index.less";
 declare type GallerySettingProps = {

package/lib/components/table/Actions/component/Group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceGroupType } from "../../../types";
 declare type GroupProps = {
     setting: DataSourceGroupType;

package/lib/components/table/Actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
 import "./index.less";

package/lib/components/table/BasicTable/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TableProps } from 'antd';
 declare const BasicTable: (props: TableProps<any>) => JSX.Element;
 export default BasicTable;

package/lib/components/table/Gallery/components/GalleryItem/components/Cover/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType, GallerySettingValueType } from "../../../../../types";
 declare type CoverProps = {
     cover?: GallerySettingType["cover"];

package/lib/components/table/Gallery/components/GalleryItem/components/RenderFields/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type RenderFieldsProps = {
     fields: string[];

package/lib/components/table/Gallery/components/GalleryItem/components/Title/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GallerySettingType } from "../../../../../types";
 import "./index.less";
 declare type TitleProps = GallerySettingType["title"] & {

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SelectField: () => JSX.Element;
 export default SelectField;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {
@@ -197,12 +198,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/table/Table/fields/link/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 import "./index.less";
 declare const Show: (props: FieldPropsType) => JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/tableConfig/SortRow/index.d.ts

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

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("filter_setting" | "group_by" | "order_by" | "column_setting" | "view_mode" | "gallery_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/View/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GridViewProps } from '../types';
 declare const View: (props: GridViewProps & {
     setTableSetting: (values: Record<string, any>) => void;

package/lib/components/versionSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 import './index.less';
 export interface Version {

package/lib/components/virtual-keyboard/Number/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface NumberProps {
     max?: number;
     min?: number;

package/package.json

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

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

@@ -1,8 +0,0 @@
-import { IconComponentProps } from '@ant-design/icons/es/components/Icon';
-import React from 'react';
-interface IconFontProps extends IconComponentProps {
-    type: string;
-    onClick?: React.MouseEventHandler<HTMLSpanElement>;
-}
-declare const IconFont: React.FC<IconFontProps>;
-export default IconFont;

package/lib/components/iconfont/index.d.ts

@@ -1,8 +0,0 @@
-import { IconComponentProps } from '@ant-design/icons/es/components/Icon';
-import React from 'react';
-interface IconFontProps extends IconComponentProps {
-    type: string;
-    onClick?: React.MouseEventHandler<HTMLSpanElement>;
-}
-declare const IconFont: React.FC<IconFontProps>;
-export default IconFont;