@pisell/materials 2.2.109 → 2.2.111

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

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["renderMode", "maxSize", "minCount", "maxCount", "multiple", "presetType", "customType", "enablePresetType", "enableCustomType", "allowPreview", "value", "typeMaxSizeMap", "enableMultilingual", "onChange", "mediaUploadUrl", "getHeaders"],
+var _excluded = ["renderMode", "maxSize", "minCount", "maxCount", "multiple", "presetType", "customType", "enablePresetType", "enableCustomType", "allowPreview", "value", "typeMaxSizeMap", "enableMultilingual", "onChange", "mediaUploadUrl", "getHeaders", "allowCamera"],
   _excluded2 = ["cover"];
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -26,7 +26,7 @@ import React, { useState, useMemo, useCallback, useEffect, useRef } from 'react'
 import { PlusOutlined } from '@ant-design/icons';
 import { Upload, Image } from 'antd';
 import { useDebounceFn, useMemoizedFn } from 'ahooks';
-import { isBoolean } from '@pisell/utils';
+import { isBoolean, isMobile } from '@pisell/utils';
 import IconFont from "../../../iconfont";
 import PisellModal from "../../../pisellModal";
 import PisellToast from "../../../pisellToast";
@@ -36,6 +36,7 @@ import { getText } from "../../../../locales";
 import { DEFAULT_MAX_COUNT, SUPPORTED_LANGUAGES } from "./constants";
 import { useIsShop } from "../../hooks/usePlatform";
 import { getPointSuffix, getFileType, getMediaMetadata, getFileMetadataParams, getDefaultFileList, createMultilingualData, createMultilingualFileList, isValueEqual, getBaseTime } from "./utils";
+import CameraPopover from "./CameraPopover";
 import { uploadFile } from "./shopUploadServe";
 
 // @ts-ignore
@@ -58,6 +59,7 @@ var BaseUpload = function BaseUpload(props) {
     onChange = props.onChange,
     propsMediaUploadUrl = props.mediaUploadUrl,
     propsGetHeaders = props.getHeaders,
+    allowCamera = props.allowCamera,
     restProps = _objectWithoutProperties(props, _excluded);
   var isShop = useIsShop();
   var _useState = useState([]),
@@ -81,6 +83,8 @@ var BaseUpload = function BaseUpload(props) {
     editMultilingualFile = _useState10[0],
     setEditMultilingualFile = _useState10[1];
   var fileListRef = useRef([]);
+  var uploadButtonRef = useRef(null);
+  var uploadRef = useRef(null);
   useEffect(function () {
     fileListRef.current = fileList;
   }, [fileList]);
@@ -317,6 +321,7 @@ var BaseUpload = function BaseUpload(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            console.log('beforeUpload000', file, newFileList);
             currentFileCount = 1;
             newFileList.forEach(function (item, index) {
               if (item.uid === file.uid) {
@@ -327,43 +332,43 @@ var BaseUpload = function BaseUpload(props) {
             typeMaxSize = typeMaxSizeMap === null || typeMaxSizeMap === void 0 ? void 0 : typeMaxSizeMap[fileType];
             _maxSize = typeMaxSize || maxSize || 10;
             if (!(file.size > _maxSize * 1024 * 1024)) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
             sizeError.run(getText('pisell-upload-setting-size-error')(_maxSize));
             return _context.abrupt("return", Upload.LIST_IGNORE);
-          case 8:
+          case 9:
             pointSuffix = getPointSuffix(file.name);
             if (!(accept !== '' && !accept.includes(pointSuffix))) {
-              _context.next = 12;
+              _context.next = 13;
               break;
             }
             typeError.run(getText('pisell-upload-setting-type-error')(pointSuffix));
             return _context.abrupt("return", Upload.LIST_IGNORE);
-          case 12:
-            _context.prev = 12;
-            _context.next = 15;
+          case 13:
+            _context.prev = 13;
+            _context.next = 16;
             return getMediaMetadata(file);
-          case 15:
+          case 16:
             metadata = _context.sent;
             if (metadata) {
               cover = metadata.cover, restMetadata = _objectWithoutProperties(metadata, _excluded2);
               file.metadata = restMetadata;
               file.cover = cover;
             }
-            _context.next = 22;
+            _context.next = 23;
             break;
-          case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](12);
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](13);
             console.error('获取媒体元数据失败:', _context.t0);
-          case 22:
-            return _context.abrupt("return", file);
           case 23:
+            return _context.abrupt("return", file);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[12, 19]]);
+      }, _callee, null, [[13, 20]]);
     }));
     return function (_x, _x2) {
       return _ref3.apply(this, arguments);
@@ -373,7 +378,8 @@ var BaseUpload = function BaseUpload(props) {
     return /*#__PURE__*/React.createElement("button", {
       className: "pisell-upload-button",
       type: "button",
-      disabled: restProps.disabled
+      disabled: restProps.disabled,
+      ref: uploadButtonRef
     }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("div", {
       className: "pisell-upload-text"
     }, getText('pisell-upload-button')), showGlobeIcon && /*#__PURE__*/React.createElement(IconFont, {
@@ -481,9 +487,183 @@ var BaseUpload = function BaseUpload(props) {
     beforeUpload: beforeUpload,
     className: 'pisell-data-source-upload'
   }, customRequest);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellUpload, _extends({}, uploadProps, {
+  var onCameraChange = function onCameraChange(file) {
+    console.log('onCameraChange', file);
+
+    // 检查文件数量限制
+    if (fileList.length >= calcMaxCount) {
+      countError.run(getText('pisell-upload-max-count-error')(calcMaxCount));
+      return;
+    }
+    var fileType = getFileType(file.name);
+    var typeMaxSize = typeMaxSizeMap === null || typeMaxSizeMap === void 0 ? void 0 : typeMaxSizeMap[fileType];
+    var _maxSize = typeMaxSize || maxSize || 10;
+    if (file.size > _maxSize * 1024 * 1024) {
+      sizeError.run(getText('pisell-upload-setting-size-error')(_maxSize));
+      return Upload.LIST_IGNORE;
+    }
+    var pointSuffix = getPointSuffix(file.name);
+    if (accept !== '' && !accept.includes(pointSuffix)) {
+      typeError.run(getText('pisell-upload-setting-type-error')(pointSuffix));
+      return Upload.LIST_IGNORE;
+    }
+
+    // 创建符合 antd Upload 格式的文件对象
+    var uploadFileObj = _objectSpread({
+      uid: file.uid || "camera-".concat(Date.now()),
+      name: file.name || "camera-".concat(Date.now(), ".jpg"),
+      status: 'uploading',
+      url: file.url || file.thumbUrl,
+      thumbUrl: file.thumbUrl || file.url,
+      originFileObj: file.originFileObj || file,
+      lastModified: file.lastModified || Date.now(),
+      lastModifiedDate: file.lastModifiedDate || new Date(),
+      type: file.type || 'image/jpeg',
+      size: file.size
+    }, enableMultilingual && {
+      multilingualFileList: createMultilingualFileList(''),
+      multilingual: createMultilingualData('')
+    });
+
+    // 添加到文件列表
+    setFileList(function (prev) {
+      var newFileList = [].concat(_toConsumableArray(prev), [uploadFileObj]);
+
+      // 如果是单文件模式，替换现有文件
+      if (!multiple && newFileList.length > 1) {
+        return [uploadFileObj];
+      }
+      return newFileList;
+    });
+
+    // 手动触发上传
+    var fileObj = uploadFileObj.originFileObj;
+    if (fileObj) {
+      // 如果有 customRequest，使用它
+      if (isShop) {
+        uploadFile(fileObj).then(function (result) {
+          // 更新文件状态
+          setFileList(function (prev) {
+            return prev.map(function (item) {
+              var _result$data, _result$data2, _result$data3, _result$data4;
+              return item.uid === uploadFileObj.uid ? _objectSpread(_objectSpread({}, item), {}, {
+                status: 'done',
+                response: result,
+                url: ((_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.url) || item.url,
+                thumbUrl: ((_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.url) || item.thumbUrl
+              }, enableMultilingual && {
+                multilingual: createMultilingualData(((_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.url) || ''),
+                multilingualFileList: createMultilingualFileList(((_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.url) || '')
+              }) : item;
+            });
+          });
+
+          // 触发 onChange 回调
+          handleChange({
+            file: _objectSpread(_objectSpread({}, uploadFileObj), {}, {
+              status: 'done',
+              response: result
+            }),
+            fileList: [].concat(_toConsumableArray(fileList), [_objectSpread(_objectSpread({}, uploadFileObj), {}, {
+              status: 'done',
+              response: result
+            })])
+          });
+        }).catch(function (error) {
+          console.error('Camera upload error:', error);
+          // 更新文件状态为错误
+          setFileList(function (prev) {
+            return prev.map(function (item) {
+              return item.uid === uploadFileObj.uid ? _objectSpread(_objectSpread({}, item), {}, {
+                status: 'error'
+              }) : item;
+            });
+          });
+          PisellToast({
+            content: getText('pisell-upload-error')(uploadFileObj.name)
+          });
+        });
+      } else {
+        // 使用默认的上传逻辑
+        var formData = new FormData();
+        formData.append(uploadProps.name || 'file', fileObj);
+
+        // 添加额外的数据
+        var extraData = function () {
+          if (typeof uploadProps.data === 'function') {
+            var result = uploadProps.data(fileObj);
+            return result instanceof Promise ? {} : result;
+          }
+          return uploadProps.data || {};
+        }();
+        Object.keys(extraData).forEach(function (key) {
+          formData.append(key, String(extraData[key]));
+        });
+
+        // 执行上传
+        fetch(uploadProps.action, {
+          method: uploadProps.method || 'post',
+          body: formData,
+          headers: uploadProps.headers || {}
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          console.log('Camera upload success:', result);
+          // 更新文件状态
+          setFileList(function (prev) {
+            return prev.map(function (item) {
+              var _result$data5, _result$data6, _result$data7, _result$data8;
+              return item.uid === uploadFileObj.uid ? _objectSpread(_objectSpread({}, item), {}, {
+                status: 'done',
+                response: result,
+                url: ((_result$data5 = result.data) === null || _result$data5 === void 0 ? void 0 : _result$data5.url) || item.url,
+                thumbUrl: ((_result$data6 = result.data) === null || _result$data6 === void 0 ? void 0 : _result$data6.url) || item.thumbUrl
+              }, enableMultilingual && {
+                multilingual: createMultilingualData(((_result$data7 = result.data) === null || _result$data7 === void 0 ? void 0 : _result$data7.url) || ''),
+                multilingualFileList: createMultilingualFileList(((_result$data8 = result.data) === null || _result$data8 === void 0 ? void 0 : _result$data8.url) || '')
+              }) : item;
+            });
+          });
+
+          // 触发 onChange 回调
+          handleChange({
+            file: _objectSpread(_objectSpread({}, uploadFileObj), {}, {
+              status: 'done',
+              response: result
+            }),
+            fileList: [].concat(_toConsumableArray(fileList), [_objectSpread(_objectSpread({}, uploadFileObj), {}, {
+              status: 'done',
+              response: result
+            })])
+          });
+        }).catch(function (error) {
+          console.error('Camera upload error:', error);
+          // 更新文件状态为错误
+          setFileList(function (prev) {
+            return prev.map(function (item) {
+              return item.uid === uploadFileObj.uid ? _objectSpread(_objectSpread({}, item), {}, {
+                status: 'error'
+              }) : item;
+            });
+          });
+          PisellToast({
+            content: getText('pisell-upload-error')(uploadFileObj.name)
+          });
+        });
+      }
+    }
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Upload, _extends({
+    ref: uploadRef
+  }, uploadProps, {
     fileList: fileList
-  }), fileList.length >= calcMaxCount ? null : renderUploadButton(!!enableMultilingual)), /*#__PURE__*/React.createElement(PisellModal, {
+  }), fileList.length >= calcMaxCount ? null : /*#__PURE__*/React.createElement(React.Fragment, null, allowCamera && !isMobile() && /*#__PURE__*/React.createElement(CameraPopover, {
+    onLocalFileClick: function onLocalFileClick() {
+      var _uploadButtonRef$curr;
+      return (_uploadButtonRef$curr = uploadButtonRef.current) === null || _uploadButtonRef$curr === void 0 ? void 0 : _uploadButtonRef$curr.click();
+    },
+    onCameraChange: onCameraChange
+  }), renderUploadButton(!!enableMultilingual))), /*#__PURE__*/React.createElement(PisellModal, {
     title: getText('pisell-upload-multilingual-title'),
     open: open,
     onCancel: handleEditMultilingualCancel,

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

@@ -0,0 +1,5 @@
+declare const CameraPopover: (props: {
+    onLocalFileClick: () => void;
+    onCameraChange: (file: any) => void;
+}) => JSX.Element;
+export default CameraPopover;

package/es/components/dataSourceComponents/fields/Upload/CameraPopover.js

@@ -0,0 +1,66 @@
+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; }
+import { Popover } from 'antd';
+import React, { useState, useRef } from 'react';
+import { getText } from "../../../../locales";
+import PisellCamera from "../../../pisellCamera";
+var CameraPopover = function CameraPopover(props) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var cameraRef = useRef(null);
+  var handleOpenChange = function handleOpenChange(newOpen) {
+    setOpen(newOpen);
+  };
+  var _onClick = function onClick(e, type) {
+    e.stopPropagation();
+    e.preventDefault();
+    if (type === 'upload') {
+      console.log('本地文件');
+      props.onLocalFileClick();
+    } else {
+      var _cameraRef$current;
+      console.log('拍照');
+      (_cameraRef$current = cameraRef.current) === null || _cameraRef$current === void 0 || _cameraRef$current.open();
+    }
+    handleOpenChange(false);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode-upload-camera-popover"
+  }, /*#__PURE__*/React.createElement(Popover, {
+    open: open,
+    onOpenChange: handleOpenChange,
+    trigger: "click",
+    arrow: false,
+    content: /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode-upload-camera-popover-content"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode-upload-camera-popover-content-item",
+      onClick: function onClick(e) {
+        return _onClick(e, 'upload');
+      }
+    }, getText('pisell-upload-camera-local-files')), /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode-upload-camera-popover-content-item",
+      onClick: function onClick(e) {
+        return _onClick(e, 'photo');
+      }
+    }, getText('pisell-upload-camera-capture'))),
+    destroyTooltipOnHide: true
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode-upload-camera-wrapper",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      handleOpenChange(true);
+    }
+  })), /*#__PURE__*/React.createElement(PisellCamera, {
+    ref: cameraRef,
+    onChange: props.onCameraChange
+  }));
+};
+export default CameraPopover;

package/es/components/dataSourceComponents/fields/Upload/index.js

@@ -29,10 +29,11 @@ var Upload = withFormItem(UploadWithMode, {
           }
         }
       };
+      return {
+        rules: [].concat(_toConsumableArray((others === null || others === void 0 ? void 0 : others.rules) || []), [rule])
+      };
     }
-    return {
-      rules: [].concat(_toConsumableArray((others === null || others === void 0 ? void 0 : others.rules) || []), [rule])
-    };
+    return {};
   }
 });
 export default Upload;

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

@@ -16,7 +16,7 @@
     right: 6px;
     bottom: 6px;
     cursor: pointer;
-    color: #98A2B3;
+    color: #98a2b3;
     font-size: 20px;
     &:hover {
       transition: color 0.3s;
@@ -78,5 +78,37 @@
   z-index: 1201 !important;
 }
 .pisell-lowcode-image-preview-operations-wrapper {
-  z-index: 1202!important;
-}
+  z-index: 1202 !important;
+}
+
+.pisell-lowcode-upload-camera-popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: transparent;
+
+  .pisell-lowcode-upload-camera-wrapper {
+    height: 100%;
+    width: 100%;
+  }
+}
+
+.pisell-lowcode-upload-camera-popover-content {
+  margin: -12px;
+  display: flex;
+  flex-direction: column;
+  width: 200px;
+  border-radius: 10px;
+  overflow: hidden;
+
+  .pisell-lowcode-upload-camera-popover-content-item {
+    padding: 10px 12px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f0f0f0;
+    }
+  }
+}

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

@@ -34,4 +34,5 @@ export interface UploadProps {
             upload_maxsize: number;
         };
     };
+    allowCamera?: boolean;
 }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -35,7 +34,7 @@ declare const formFieldMap: {
     };
     FormItemSelect: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "custom" | "default" | "api" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -60,21 +59,7 @@ 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("./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("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & 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("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
-    options?: any;
-    optionSourceType?: "custom" | "default" | "api" | undefined;
-    labelField: string;
-    valueField: string;
-    extraParams?: Record<string, any> | undefined;
-} & {
-    dataSource?: any;
-}) => JSX.Element) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (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>;
-}) | 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/type").InputProps> & {
+declare const getFieldComponent: (fieldComponent: string) => (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>;
@@ -94,9 +79,23 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & 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("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | import("react").FC<import("./IconSelect/type").IconSelectProps & 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("./Upload/type").UploadProps & 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("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<any> | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
+    options?: any;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
+    labelField: string;
+    valueField: string;
+    extraParams?: Record<string, any> | undefined;
+} & {
+    dataSource?: any;
+}) => JSX.Element) | (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<{}> & {
+    Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+} & {
+    Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+}) | 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>;
 export { getFieldComponent, formFieldMap };

package/es/components/dataSourceComponents/hooks/usePlatform.d.ts

@@ -1,3 +1,5 @@
 declare const usePlatform: () => any;
 declare const useIsShop: () => boolean;
-export { usePlatform, useIsShop };
+declare const useIsH5: () => boolean;
+declare const useIsPc: () => boolean;
+export { usePlatform, useIsShop, useIsH5, useIsPc };

package/es/components/dataSourceComponents/hooks/usePlatform.js

@@ -9,4 +9,12 @@ var useIsShop = function useIsShop() {
   var platform = usePlatform();
   return platform === 'shop';
 };
-export { usePlatform, useIsShop };
+var useIsH5 = function useIsH5() {
+  var platform = usePlatform();
+  return platform === 'h5';
+};
+var useIsPc = function useIsPc() {
+  var platform = usePlatform();
+  return platform === 'pc';
+};
+export { usePlatform, useIsShop, useIsH5, useIsPc };

package/es/components/date-picker/datePickerCpt.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './index.less';

package/es/components/date-picker/index.d.ts

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

package/es/components/drag-sort-tree/TreeItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ValueProps, SortType } from '../types';
 declare type IdType = string | number;

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

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

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

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

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

@@ -10,11 +10,12 @@ export declare type FilterType = {
     /** 筛选列表 */
     list: FilterItemProps[];
     items?: string[];
-    __items: string[];
     /** 快速筛选最大长度 */
     quickFilterMaxLength: number;
     /** 配置存储模式 */
     storageMode: "" | "localStorage";
+    /** 筛选列表项dom */
+    dom?: any;
 };
 /**
  * 筛选列表项配置

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

@@ -0,0 +1,8 @@
+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/es/components/iconfont/index.js

@@ -2,7 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import { createFromIconfontCN } from '@ant-design/icons';
 import React from 'react';
 var MyIcon = createFromIconfontCN({
-  scriptUrl: 'https://static.pisellcdn.com/pisell2iconfont1.14.js' // 在 iconfont.cn 上生成
+  scriptUrl: 'https://static.pisellcdn.com/pisell2iconfont1.16.js' // 在 iconfont.cn 上生成
 });
 var IconFont = function IconFont(props) {
   return /*#__PURE__*/React.createElement(MyIcon, _extends({}, props, {