@pisell/materials 1.0.483 → 1.0.485

package/es/locales/zh-TW.d.ts

@@ -151,5 +151,9 @@ declare const _default: {
     'pisell-upload-setting-size-error': (maxSize: number) => string;
     'pisell-upload-setting-type-error': (type: string) => string;
     'pisell-upload-count-error': (count: number) => string;
+    'walletCard-points': string;
+    'walletCard-rechargeable': string;
+    'walletCard-voucher': string;
+    'walletCard-discount': string;
 };
 export default _default;

package/es/locales/zh-TW.js

@@ -195,5 +195,9 @@ export default {
   },
   'pisell-upload-count-error': function pisellUploadCountError(count) {
     return "\u8ACB\u4E0A\u50B3".concat(count, "\u500B\u6587\u4EF6");
-  }
+  },
+  'walletCard-points': '積分卡',
+  'walletCard-rechargeable': '充值卡',
+  'walletCard-voucher': '代金券',
+  'walletCard-discount': '折扣卡'
 };

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

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const ColorPicker: React.FC<import("./type").ColorPickerProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
+declare const ColorPicker: React.FC<import("antd").ColorPickerProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
 export default ColorPicker;

package/lib/components/dataSourceComponents/fields/TimePicker/WithMode.js

@@ -105,8 +105,8 @@ var TimePicker = (props) => {
         value: normalizedValue == null ? void 0 : normalizedValue.format("HH:mm"),
         onChange: (timeString) => {
           if (onChange) {
-            const timeValue = (0, import_dayjs.default)(`${(0, import_dayjs.default)().format("YYYY-MM-DD")} ${timeString}`);
-            onChange(timeValue, timeString);
+            const timeValue = timeString ? (0, import_dayjs.default)(`${(0, import_dayjs.default)().format("YYYY-MM-DD")} ${timeString}`) : null;
+            onChange(timeValue, timeString || "");
           }
         },
         timePickerProps: {

package/lib/components/dataSourceComponents/fields/Upload/BaseUpload.js

@@ -36,15 +36,17 @@ var import_react = __toESM(require("react"));
 var import_icons = require("@ant-design/icons");
 var import_antd = require("antd");
 var import_ahooks = require("ahooks");
+var import_utils = require("@pisell/utils");
+var import_iconfont = __toESM(require("../../../iconfont"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_locales = require("../../../../locales");
 var import_pisellUpload = __toESM(require("../../../pisellUpload"));
-var import_utils = require("./utils");
+var import_utils2 = require("./utils");
 var import_index = require("./index.less");
 var BaseUpload = (props) => {
   const {
     renderMode,
-    maxSize,
+    maxSize = 3,
     minCount,
     maxCount,
     multiple,
@@ -52,11 +54,42 @@ var BaseUpload = (props) => {
     customType,
     enablePresetType,
     enableCustomType,
+    allowPreview,
+    value,
     ...restProps
   } = props;
   const [fileList, setFileList] = (0, import_react.useState)([]);
+  const [previewImage, setPreviewImage] = (0, import_react.useState)("");
+  const [previewOpen, setPreviewOpen] = (0, import_react.useState)(false);
   const { appHelper } = (0, import_useEngineContext.default)();
   const { mediaUploadUrl, getHeaders } = appHelper == null ? void 0 : appHelper.constants;
+  (0, import_react.useEffect)(() => {
+    if (!value) {
+      setFileList([]);
+      return;
+    }
+    if ((0, import_utils.isString)(value)) {
+      setFileList([
+        {
+          uid: "-1",
+          name: value.split("/").pop() || "file",
+          status: "done",
+          url: value
+        }
+      ]);
+      return;
+    }
+    if (Array.isArray(value)) {
+      const newFileList = value.map((url, index) => ({
+        uid: `-${index + 1}`,
+        name: url.split("/").pop() || `file${index + 1}`,
+        status: "done",
+        url
+      }));
+      setFileList(newFileList);
+      return;
+    }
+  }, [value]);
   const calcMaxCount = (0, import_react.useMemo)(() => {
     if (multiple) {
       return maxCount || 9;
@@ -64,31 +97,62 @@ var BaseUpload = (props) => {
     return 1;
   }, [maxCount, minCount, multiple]);
   const getMediaMetadata = async (file) => {
-    return new Promise((resolve) => {
-      if (file.type.startsWith("image/")) {
-        const img = new Image();
-        img.src = URL.createObjectURL(file);
-        img.onload = () => {
-          URL.revokeObjectURL(img.src);
-          resolve({
-            width: img.width,
-            height: img.height
-          });
-        };
-      } else if (file.type.startsWith("video/")) {
+    if (file.type.startsWith("video/")) {
+      return new Promise((resolve) => {
         const video = document.createElement("video");
         video.preload = "metadata";
-        video.src = URL.createObjectURL(file);
+        const canvas = document.createElement("canvas");
+        let hasMetadata = false;
+        let hasSeeked = false;
+        const tryResolve = () => {
+          if (hasMetadata && hasSeeked) {
+            const ctx = canvas.getContext("2d");
+            ctx == null ? void 0 : ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
+            canvas.toBlob(
+              (blob) => {
+                if (blob) {
+                  const cover = new File([blob], `${file.name}-cover.jpg`, {
+                    type: "image/jpeg"
+                  });
+                  URL.revokeObjectURL(video.src);
+                  resolve({
+                    width: video.videoWidth,
+                    height: video.videoHeight,
+                    duration: video.duration,
+                    bitrate: file.size / video.duration,
+                    cover
+                  });
+                } else {
+                  URL.revokeObjectURL(video.src);
+                  resolve({
+                    width: video.videoWidth,
+                    height: video.videoHeight,
+                    duration: video.duration,
+                    bitrate: file.size / video.duration
+                  });
+                }
+              },
+              "image/jpeg",
+              0.8
+            );
+          }
+        };
         video.onloadedmetadata = () => {
-          URL.revokeObjectURL(video.src);
-          resolve({
-            width: video.videoWidth,
-            height: video.videoHeight,
-            duration: video.duration,
-            bitrate: file.size / video.duration
-          });
+          canvas.width = video.videoWidth;
+          canvas.height = video.videoHeight;
+          video.currentTime = 0;
+          hasMetadata = true;
+          tryResolve();
         };
-      } else if (file.type.startsWith("audio/")) {
+        video.onseeked = () => {
+          hasSeeked = true;
+          tryResolve();
+        };
+        video.src = URL.createObjectURL(file);
+      });
+    }
+    if (file.type.startsWith("audio/")) {
+      return new Promise((resolve) => {
         const audio = document.createElement("audio");
         audio.preload = "metadata";
         audio.src = URL.createObjectURL(file);
@@ -99,21 +163,15 @@ var BaseUpload = (props) => {
             bitrate: file.size / audio.duration
           });
         };
-      } else {
-        resolve({});
-      }
-    });
+      });
+    }
+    return Promise.resolve(null);
   };
   const handleChange = async ({ file, fileList: newFileList }) => {
-    var _a, _b;
+    var _a, _b, _c;
     setFileList(newFileList);
-    if (file.status === "uploading") {
-      const metadata = await getMediaMetadata(file.originFileObj);
-      file.metadata = metadata;
-    }
     if (file.status === "done") {
-      import_antd.message.success(`${file.name} 上传成功`);
-      (_b = props.onChange) == null ? void 0 : _b.call(props, (_a = file.response) == null ? void 0 : _a.url);
+      (_c = props.onChange) == null ? void 0 : _c.call(props, (_b = (_a = file.response) == null ? void 0 : _a.data) == null ? void 0 : _b.url);
     } else if (file.status === "error") {
       import_antd.message.error(`${file.name} 上传失败`);
     }
@@ -142,16 +200,25 @@ var BaseUpload = (props) => {
       wait: 500
     }
   );
-  const uploadButton = /* @__PURE__ */ import_react.default.createElement("button", { className: "pisell-upload-button", type: "button" }, /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-upload-text" }, (0, import_locales.getText)("pisell-upload-button")));
+  const uploadButton = /* @__PURE__ */ import_react.default.createElement(
+    "button",
+    {
+      className: "pisell-upload-button",
+      type: "button",
+      disabled: restProps.disabled
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-upload-text" }, (0, import_locales.getText)("pisell-upload-button"))
+  );
   const accept = (0, import_react.useMemo)(() => {
     let types = [];
     if (enablePresetType) {
-      types = [...presetType || []];
+      types = [...(0, import_utils2.getPresetTypes)(presetType) || []];
     }
     if (enableCustomType) {
       types = [...types, ...customType || []];
     }
-    return types.join(", ");
+    return types.join(",");
   }, [presetType, customType, enableCustomType, enablePresetType]);
   const beforeUpload = async (file, newFileList) => {
     let currentFileCount = 1;
@@ -160,16 +227,16 @@ var BaseUpload = (props) => {
         currentFileCount = index + 1;
       }
     });
-    if (file.size > calcMaxCount * 1024 * 1024) {
+    if (file.size > maxSize * 1024 * 1024) {
       sizeError.run((0, import_locales.getText)("pisell-upload-setting-size-error")(maxSize));
-      return false;
+      return import_antd.Upload.LIST_IGNORE;
     }
-    const pointSuffix = (0, import_utils.getPointSuffix)(file.name);
+    const pointSuffix = (0, import_utils2.getPointSuffix)(file.name);
     if (accept !== "" && !(accept || "").includes(pointSuffix)) {
       typeError.run((0, import_locales.getText)("pisell-upload-setting-type-error")(pointSuffix));
-      return false;
+      return import_antd.Upload.LIST_IGNORE;
     }
-    const { success, message: messageStr } = (0, import_utils.checkFileCount)({
+    const { success, message: messageStr } = (0, import_utils2.checkFileCount)({
       minCount: minCount || 0,
       maxCount: maxCount || 9,
       valueLength: fileList.length + currentFileCount,
@@ -177,15 +244,41 @@ var BaseUpload = (props) => {
     });
     if (!success) {
       countError.run(messageStr);
-      return false;
+      return import_antd.Upload.LIST_IGNORE;
+    }
+    try {
+      const metadata = await getMediaMetadata(file);
+      if (metadata) {
+        const { cover, ...restMetadata } = metadata;
+        file.metadata = restMetadata;
+        file.cover = cover;
+      }
+    } catch (error) {
+      console.error("获取媒体元数据失败:", error);
     }
     return file;
   };
-  return /* @__PURE__ */ import_react.default.createElement(
+  const handlePreview = (file) => {
+    var _a, _b;
+    setPreviewImage(file.url || ((_b = (_a = file.response) == null ? void 0 : _a.data) == null ? void 0 : _b.url) || "");
+    setPreviewOpen(true);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_pisellUpload.default,
     {
       ...restProps,
+      multiple,
+      showUploadList: {
+        showRemoveIcon: true,
+        showPreviewIcon: allowPreview
+      },
       uploadType: "custom",
+      iconRender: () => /* @__PURE__ */ import_react.default.createElement(
+        import_iconfont.default,
+        {
+          type: "pisell2-a-BlueFile1"
+        }
+      ),
       listType: "picture-card",
       fileList,
       onChange: handleChange,
@@ -193,14 +286,35 @@ var BaseUpload = (props) => {
       method: "post",
       accept,
       name: "file",
-      data: (file) => ({
-        group_id: 0,
-        metadata: file.metadata ? JSON.stringify(file.metadata) : void 0
-      }),
-      headers: getHeaders(),
+      onPreview: handlePreview,
+      data: (file) => {
+        var _a, _b, _c, _d;
+        return {
+          group_id: 0,
+          ...file.metadata ? {
+            "metadata[width]": (_a = file.metadata) == null ? void 0 : _a.width,
+            "metadata[height]": (_b = file.metadata) == null ? void 0 : _b.height,
+            "metadata[duration]": (_c = file.metadata) == null ? void 0 : _c.duration,
+            "metadata[bitrate]": (_d = file.metadata) == null ? void 0 : _d.bitrate
+          } : {},
+          ...file.cover ? { cover: file.cover } : {}
+        };
+      },
+      headers: getHeaders == null ? void 0 : getHeaders(),
       beforeUpload
     },
     fileList.length >= calcMaxCount ? null : uploadButton
-  );
+  ), previewImage && /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Image,
+    {
+      wrapperStyle: { display: "none" },
+      preview: {
+        visible: previewOpen,
+        onVisibleChange: (visible) => setPreviewOpen(visible),
+        afterOpenChange: (visible) => !visible && setPreviewImage("")
+      },
+      src: previewImage
+    }
+  ));
 };
 var BaseUpload_default = BaseUpload;

package/lib/components/dataSourceComponents/fields/Upload/ReadPretty.js

@@ -33,7 +33,8 @@ __export(ReadPretty_exports, {
 });
 module.exports = __toCommonJS(ReadPretty_exports);
 var import_react = __toESM(require("react"));
+var import_antd = require("antd");
 var UploadReadPretty = (props) => {
-  return /* @__PURE__ */ import_react.default.createElement("div", null, "UploadReadPretty");
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Image, { src: props.value });
 };
 var ReadPretty_default = UploadReadPretty;

package/lib/components/dataSourceComponents/fields/Upload/index.less

@@ -1,8 +1,13 @@
 .pisell-upload-button {
   border: 0;
   background: none;
-  
+  cursor: inherit;
+
   .pisell-upload-text {
     margin-top: 8px;
   }
+
+  // &[disabled] {
+  //   opacity: 0.4;
+  // }
 }

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

@@ -10,7 +10,7 @@ export interface UploadFile extends AntdUploadFile {
 }
 export interface UploadProps extends PisellUploadProps {
     renderMode?: 'read' | 'edit';
-    value?: string;
+    value?: string | string[];
     allowMediaLibrary?: boolean;
     allowLocalUpload?: boolean;
     allowPreview?: boolean;

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

@@ -1,5 +1,6 @@
 export declare const getSuffix: (name: string) => string | undefined;
 export declare const getPointSuffix: (name: string) => string;
+export declare const getPresetTypes: (presetTypes?: string[]) => string[];
 export declare const checkFileCount: ({ multiple, minCount, maxCount, valueLength, }: {
     multiple: boolean;
     minCount: number;

package/lib/components/dataSourceComponents/fields/Upload/utils.js

@@ -21,6 +21,7 @@ var utils_exports = {};
 __export(utils_exports, {
   checkFileCount: () => checkFileCount,
   getPointSuffix: () => getPointSuffix,
+  getPresetTypes: () => getPresetTypes,
   getSuffix: () => getSuffix
 });
 module.exports = __toCommonJS(utils_exports);
@@ -31,6 +32,237 @@ var getSuffix = (name) => {
 var getPointSuffix = (name) => {
   return `.${getSuffix(name)}`;
 };
+var presetTypeData = [
+  {
+    title: "文档",
+    key: "documents",
+    children: [
+      {
+        key: "pdf",
+        title: "PDF",
+        types: [".pdf"],
+        color: "red"
+      },
+      {
+        key: "word",
+        title: "Word文档",
+        types: [".doc", ".docx"],
+        color: "blueDark"
+      },
+      {
+        key: "excel",
+        title: "Excel工作簿",
+        types: [".xls", ".xlsx"],
+        color: "green600"
+      },
+      {
+        key: "powerPoint",
+        title: "PowerPoint演示文稿",
+        types: [".ppt", ".pptx"],
+        color: "orangeDark"
+      },
+      {
+        key: "textFile",
+        title: "文本文件",
+        types: [".txt"],
+        color: "gray700"
+      },
+      {
+        key: "richFile",
+        title: "富文本格式",
+        types: [".rtf"],
+        color: "gray500"
+      },
+      {
+        key: "csv",
+        title: "CSV",
+        types: [".csv"],
+        color: "green600"
+      }
+    ]
+  },
+  {
+    title: "图片",
+    key: "images",
+    children: [
+      {
+        key: "jpg",
+        title: "JPG",
+        types: [".jpg", ".jpeg"],
+        color: "img"
+      },
+      {
+        key: "png",
+        title: "PNG",
+        types: [".png"],
+        color: "img"
+      },
+      {
+        key: "gif",
+        title: "GIF",
+        types: [".gif"],
+        color: "img"
+      },
+      {
+        key: "bmp",
+        title: "BMP",
+        types: [".bmp"],
+        color: "img"
+      },
+      {
+        key: "tiff",
+        title: "TIFF",
+        types: ["tif", ".tiff"],
+        color: "img"
+      },
+      {
+        key: "svg",
+        title: "SVG",
+        types: [".svg"],
+        color: "img"
+      },
+      {
+        key: "webp",
+        title: "WEBP",
+        types: [".webp"],
+        color: "img"
+      }
+    ]
+  },
+  {
+    title: "音频",
+    key: "audio",
+    children: [
+      {
+        key: "mp3",
+        title: "MP3",
+        types: [".mp3"],
+        color: "pink600"
+      },
+      {
+        key: "wav",
+        title: "WAV",
+        types: [".wav"],
+        color: "pink600"
+      },
+      {
+        key: "flac",
+        title: "FLAC",
+        color: "pink600",
+        types: [".flac"]
+      },
+      {
+        key: "aac",
+        title: "AAC",
+        color: "pink600",
+        types: [".aac", ".m4a"]
+      },
+      {
+        key: "ogg",
+        title: "OGG",
+        types: [".ogg"],
+        color: "pink600"
+      }
+    ]
+  },
+  {
+    title: "视频",
+    key: "video",
+    children: [
+      {
+        key: "mp4",
+        title: "MP4",
+        types: [".mp4"],
+        color: "blueDark"
+      },
+      {
+        key: "avi",
+        title: "AVI",
+        types: [".avi"],
+        color: "blueDark"
+      },
+      {
+        key: "mkv",
+        title: "MKV",
+        types: [".mkv"],
+        color: "blueDark"
+      },
+      {
+        key: "mov",
+        title: "MOV",
+        types: [".mov"],
+        color: "blueDark"
+      },
+      {
+        key: "wmv",
+        title: "WMV",
+        types: [".wmv"],
+        color: "blueDark"
+      },
+      {
+        key: "flv",
+        title: "FLV",
+        types: [".flv"],
+        color: "blueDark"
+      }
+    ]
+  },
+  {
+    title: "压缩文件",
+    key: "compressedFiles",
+    children: [
+      {
+        key: "zip",
+        title: "ZIP",
+        types: [".zip"],
+        color: "gray700"
+      },
+      {
+        key: "rar",
+        title: "RAR",
+        types: [".rar"],
+        color: "gray700"
+      },
+      {
+        key: "7z",
+        title: "7Z",
+        types: [".7z"],
+        color: "gray700"
+      },
+      {
+        key: "tar",
+        title: "TAR",
+        types: [".tar"],
+        color: "gray700"
+      },
+      {
+        key: "gz",
+        title: "GZ",
+        types: [".gz"],
+        color: "gray700"
+      }
+    ]
+  }
+];
+var allChildren = presetTypeData.map((item) => item.children).flat(1);
+var presetTypeMap = allChildren.reduce(
+  (pre, cur) => {
+    return {
+      ...pre,
+      [cur.key]: cur.types
+    };
+  },
+  {}
+);
+var getPresetTypes = (presetTypes) => {
+  if (!presetTypes)
+    return [];
+  const types = [];
+  presetTypes.forEach((item) => {
+    types.push(...presetTypeMap[item] || []);
+  });
+  return types;
+};
 var checkFileCount = ({
   multiple,
   minCount,
@@ -41,12 +273,12 @@ var checkFileCount = ({
     if (minCount === maxCount && valueLength !== minCount) {
       return {
         success: false,
-        message: (0, import_locales.getText)("pisell-upload-count-error")(minCount, maxCount)
+        message: (0, import_locales.getText)("pisell-upload-count-error")(minCount)
       };
     } else if (minCount !== maxCount && (valueLength < minCount || valueLength > maxCount)) {
       return {
         success: false,
-        message: (0, import_locales.getText)("pisell-upload-count-error")(minCount, maxCount)
+        message: (0, import_locales.getText)("pisell-upload-count-error")(`${minCount}-${maxCount}`)
       };
     }
   }
@@ -58,5 +290,6 @@ var checkFileCount = ({
 0 && (module.exports = {
   checkFileCount,
   getPointSuffix,
+  getPresetTypes,
   getSuffix
 });