@pisell/materials 1.0.660 → 1.0.662

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -45,7 +45,8 @@ var useTableProps = function useTableProps(props) {
     search = originProps.search,
     clickToDetail = originProps.clickToDetail,
     propsOnRow = originProps.onRow,
-    filterBy = originProps.filterBy;
+    filterBy = originProps.filterBy,
+    onDeleteFinish = originProps.onDeleteFinish;
   var _ref = operation || {},
     items = _ref.items,
     show = _ref.show,
@@ -138,11 +139,12 @@ var useTableProps = function useTableProps(props) {
                       _context.next = 8;
                       return destroy === null || destroy === void 0 ? void 0 : destroy.runAsync(record.id);
                     case 8:
+                      onDeleteFinish === null || onDeleteFinish === void 0 || onDeleteFinish(record);
                       refreshData();
                       PisellToast({
                         content: getText('pisell-action-delete-success')
                       });
-                    case 10:
+                    case 11:
                     case "end":
                       return _context.stop();
                   }

package/es/components/dataSourceComponents/fields/Input/WithMode.js

@@ -1,12 +1,525 @@
+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 = ["allowScan", "scanCodeType", "language"];
 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); }
-import { Input as AntInput } from 'antd';
-import React from 'react';
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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; }
+// @ts-nocheck
+import { Input as AntInput, Button, Upload, message } from 'antd';
+import React, { useState, useMemo, useEffect, useRef } from 'react';
+import { ScanOutlined, PictureOutlined, ArrowLeftOutlined } from '@ant-design/icons';
+import { BrowserMultiFormatReader, BarcodeFormat } from '@zxing/library';
 import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
+import PisellScan from "../../../pisellScan";
+import { getText } from "../../../../locales";
+import { getCurrentLocale } from "../../../../utils/locale";
+import usePisellConfig from "../../../pisell-config-provider/hooks/usePisellConfig";
+
+// 为原生桥接声明全局类型
+
+// 用于判断是否处于开发环境
+var isDevelopEnv = process.env.NODE_ENV === 'development';
 var Input = function Input(props) {
-  return /*#__PURE__*/React.createElement(AntInput, _extends({}, props, {
-    ref: props.innerRef || undefined
-  }));
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    scanVisible = _useState2[0],
+    setScanVisible = _useState2[1];
+  var _usePisellConfig = usePisellConfig(),
+    _usePisellConfig$plat = _usePisellConfig.platform,
+    platform = _usePisellConfig$plat === void 0 ? 'pc' : _usePisellConfig$plat;
+  var isH5 = platform === 'h5';
+  var scanRef = useRef(null);
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    debugValue = _useState4[0],
+    setDebugValue = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    fullScreenMode = _useState6[0],
+    setFullScreenMode = _useState6[1];
+  var scanContainerRef = useRef(null);
+
+  // 监控props.value的变化
+  useEffect(function () {
+    if (props.value !== undefined) {
+      if (isDevelopEnv) {
+        console.log('[Input.WithMode] props.value变化:', props.value);
+      }
+      setDebugValue(props.value);
+    }
+  }, [props.value]);
+
+  // 包装onChange处理函数
+  var handleChange = function handleChange(e) {
+    if (e && e.target) {
+      setDebugValue(e.target.value);
+    } else if (e === '' || e === null || e === undefined) {
+      setDebugValue('');
+    }
+    if (props.onChange) {
+      props.onChange(e);
+    }
+  };
+
+  // 从props中获取属性
+  var _props$allowScan = props.allowScan,
+    allowScan = _props$allowScan === void 0 ? false : _props$allowScan,
+    _props$scanCodeType = props.scanCodeType,
+    scanCodeType = _props$scanCodeType === void 0 ? 'all' : _props$scanCodeType,
+    _props$language = props.language,
+    language = _props$language === void 0 ? getCurrentLocale() : _props$language,
+    restProps = _objectWithoutProperties(props, _excluded);
+
+  // 根据scanCodeType确定扫描的格式
+  var formatMap = {
+    all: [BarcodeFormat.QR_CODE, BarcodeFormat.EAN_8, BarcodeFormat.EAN_13, BarcodeFormat.CODE_128, BarcodeFormat.CODE_39, BarcodeFormat.CODE_93],
+    qrcode: [BarcodeFormat.QR_CODE],
+    barcode: [BarcodeFormat.EAN_8, BarcodeFormat.EAN_13, BarcodeFormat.CODE_128, BarcodeFormat.CODE_39, BarcodeFormat.CODE_93]
+  };
+
+  // 获取当前扫码类型对应的格式数组
+  var formats = useMemo(function () {
+    if (scanCodeType === 'qrcode') {
+      return formatMap.qrcode;
+    } else if (scanCodeType === 'barcode') {
+      return formatMap.barcode;
+    } else {
+      return formatMap.all;
+    }
+  }, [scanCodeType]);
+
+  // 获取扫码类型文本
+  var getScanTypeText = useMemo(function () {
+    if (isDevelopEnv) {
+      console.log('[Input.WithMode] 当前扫码类型:', scanCodeType);
+    }
+    if (scanCodeType === 'qrcode') {
+      return getText('scan.qrcode');
+    } else if (scanCodeType === 'barcode') {
+      return getText('scan.barcode');
+    } else {
+      return getText('scan.all');
+    }
+  }, [scanCodeType]);
+  var getBackText = getText('scan.back');
+  var getFromAlbumText = getText('scan.fromAlbum');
+
+  // 处理扫码结果
+  var handleScan = function handleScan(value, barcodeFormat, isValidType) {
+    var _scanRef$current2;
+    if (isDevelopEnv) {
+      console.log('[Input.WithMode] 扫码结果:', value, '码类型:', barcodeFormat, '是否有效类型:', isValidType);
+    }
+
+    // 确保值有效
+    if (!value) {
+      console.warn('[Input.WithMode] 扫码结果为空');
+      return;
+    }
+
+    // 验证扫码类型是否符合要求
+    if (isValidType === false) {
+      var _scanRef$current;
+      // 关闭扫码界面
+      setScanVisible(false);
+      setFullScreenMode(false);
+      (_scanRef$current = scanRef.current) === null || _scanRef$current === void 0 || (_scanRef$current = _scanRef$current.codeReader) === null || _scanRef$current === void 0 || _scanRef$current.reset();
+
+      // 显示错误提示
+      var errorMsg = scanCodeType === 'qrcode' ? getText('scan.qrcodeOnlyError') : getText('scan.barcodeOnlyError');
+      message.error(errorMsg || "\u4E0D\u7B26\u5408\u5F53\u524D\u626B\u7801\u7C7B\u578B\u8981\u6C42\uFF0C\u8BF7\u626B\u63CF".concat(getScanTypeText));
+      return;
+    }
+
+    // 关闭扫码界面
+    setScanVisible(false);
+    setFullScreenMode(false);
+    (_scanRef$current2 = scanRef.current) === null || _scanRef$current2 === void 0 || (_scanRef$current2 = _scanRef$current2.codeReader) === null || _scanRef$current2 === void 0 || _scanRef$current2.reset();
+
+    // 设置扫码结果
+    handleChange({
+      target: {
+        value: value
+      }
+    });
+  };
+
+  // 退出全屏扫码
+  var exitFullScreenScan = function exitFullScreenScan() {
+    var _scanRef$current3;
+    if (document.exitFullscreen) {
+      document.exitFullscreen().catch(function (err) {
+        console.error('退出全屏失败:', err);
+      });
+    }
+    setFullScreenMode(false);
+    setScanVisible(false);
+    (_scanRef$current3 = scanRef.current) === null || _scanRef$current3 === void 0 || (_scanRef$current3 = _scanRef$current3.codeReader) === null || _scanRef$current3 === void 0 || _scanRef$current3.reset();
+  };
+
+  // 处理扫码按钮点击事件
+  var handleScanClick = function handleScanClick() {
+    if (isDevelopEnv) {
+      console.log('[Input.WithMode] 点击扫码按钮，当前扫码类型:', scanCodeType, '标题:', getScanTypeText);
+    }
+    if (isH5) {
+      var _window$webkit, _window$nativeBridge;
+      // 移动设备扫码逻辑 - 直接唤起原生扫码
+      if ((_window$webkit = window.webkit) !== null && _window$webkit !== void 0 && (_window$webkit = _window$webkit.messageHandlers) !== null && _window$webkit !== void 0 && _window$webkit.nativeScan) {
+        // iOS 扫码
+        window.webkit.messageHandlers.nativeScan.postMessage({
+          scanType: scanCodeType || 'all'
+        });
+      } else if ((_window$nativeBridge = window.nativeBridge) !== null && _window$nativeBridge !== void 0 && _window$nativeBridge.scan) {
+        // Android 扫码
+        window.nativeBridge.scan(scanCodeType || 'all');
+      } else {
+        // H5环境，但没有原生扫码能力，使用全屏H5扫码
+        setScanVisible(true);
+        setFullScreenMode(true);
+
+        // 请求全屏
+        setTimeout(function () {
+          if (scanContainerRef.current && scanContainerRef.current.requestFullscreen) {
+            scanContainerRef.current.requestFullscreen().catch(function (err) {
+              console.error('进入全屏失败:', err);
+              // 即使全屏失败，也显示扫码界面
+            });
+          }
+        }, 100);
+      }
+    }
+  };
+
+  // 处理从相册选择图片
+  var handleImageSelect = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file) {
+      var url, img;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (isDevelopEnv) {
+              console.log('[handleImageSelect] 选择图片:', file);
+            }
+
+            // 检查文件类型
+            if (file.type.includes('image/')) {
+              _context2.next = 4;
+              break;
+            }
+            message.error('请选择图片文件');
+            return _context2.abrupt("return", false);
+          case 4:
+            try {
+              message.loading({
+                content: '正在处理图片...',
+                key: 'scanLoading',
+                duration: 0
+              });
+
+              // 创建图片URL
+              url = URL.createObjectURL(file); // 创建图片元素
+              img = new Image(); // 处理图片加载完成
+              img.onload = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                var canvas, ctx, imageData, hints, reader, _result, barcodeFormat, isValidType, errorMsg;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.prev = 0;
+                      // 创建临时canvas
+                      canvas = document.createElement('canvas');
+                      ctx = canvas.getContext('2d'); // 设置canvas尺寸
+                      canvas.width = img.width;
+                      canvas.height = img.height;
+
+                      // 在canvas上绘制图片
+                      ctx === null || ctx === void 0 || ctx.drawImage(img, 0, 0, img.width, img.height);
+
+                      // 获取图片数据
+                      imageData = ctx === null || ctx === void 0 ? void 0 : ctx.getImageData(0, 0, canvas.width, canvas.height);
+                      if (!imageData) {
+                        _context.next = 24;
+                        break;
+                      }
+                      // 创建解码器
+                      hints = new Map();
+                      if (formats && formats.length > 0) {
+                        hints.set(2, formats); // 2 对应 DecodeHintType.POSSIBLE_FORMATS
+                      }
+                      reader = new BrowserMultiFormatReader(hints);
+                      _context.prev = 11;
+                      _context.next = 14;
+                      return reader.decodeFromImageData(imageData);
+                    case 14:
+                      _result = _context.sent;
+                      // 获取扫码类型
+                      barcodeFormat = _result.getBarcodeFormat(); // 验证是否符合扫码类型要求
+                      isValidType = !formats || formats.length === 0 || formats.includes(barcodeFormat);
+                      if (!isValidType) {
+                        // 显示错误提示
+                        errorMsg = scanCodeType === 'qrcode' ? getText('scan.qrcodeOnlyError') : getText('scan.barcodeOnlyError');
+                        message.error({
+                          content: errorMsg || "\u4E0D\u7B26\u5408\u5F53\u524D\u626B\u7801\u7C7B\u578B\u8981\u6C42\uFF0C\u8BF7\u626B\u63CF".concat(getScanTypeText),
+                          key: 'scanLoading'
+                        });
+                      } else {
+                        // 关闭loading
+                        message.success({
+                          content: '识别成功',
+                          key: 'scanLoading'
+                        });
+
+                        // 处理扫码结果
+                        setScanVisible(false);
+                        setFullScreenMode(false);
+
+                        // 设置扫码结果
+                        handleChange({
+                          target: {
+                            value: _result.getText()
+                          }
+                        });
+                      }
+                      _context.next = 24;
+                      break;
+                    case 20:
+                      _context.prev = 20;
+                      _context.t0 = _context["catch"](11);
+                      console.error('[handleImageSelect] 扫描图片失败:', _context.t0);
+                      message.error({
+                        content: '未能识别二维码/条形码',
+                        key: 'scanLoading'
+                      });
+                    case 24:
+                      _context.next = 30;
+                      break;
+                    case 26:
+                      _context.prev = 26;
+                      _context.t1 = _context["catch"](0);
+                      console.error('[handleImageSelect] 扫描图片失败:', _context.t1);
+                      message.error({
+                        content: '未能识别二维码/条形码',
+                        key: 'scanLoading'
+                      });
+                    case 30:
+                      // 释放URL资源
+                      URL.revokeObjectURL(url);
+                    case 31:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee, null, [[0, 26], [11, 20]]);
+              }));
+
+              // 处理图片加载失败
+              img.onerror = function () {
+                URL.revokeObjectURL(url);
+                message.error({
+                  content: '图片加载失败',
+                  key: 'scanLoading'
+                });
+              };
+
+              // 设置图片源
+              img.src = url;
+            } catch (error) {
+              console.error('[handleImageSelect] 处理图片失败:', error);
+              message.error({
+                content: '处理图片失败',
+                key: 'scanLoading'
+              });
+            }
+            return _context2.abrupt("return", false);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleImageSelect(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  // 自定义输入框组件，完全控制清空和扫描操作
+  var CustomInput = function CustomInput() {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        width: '100%',
+        position: 'relative'
+      }
+    }, /*#__PURE__*/React.createElement(AntInput, _extends({}, restProps, {
+      ref: props.innerRef || undefined,
+      style: _objectSpread(_objectSpread({}, props.style), {}, {
+        flex: 1
+      }, allowScan && isH5 ? {
+        borderTopRightRadius: 0,
+        borderBottomRightRadius: 0,
+        borderRight: 0
+      } : {}),
+      onChange: handleChange,
+      value: debugValue,
+      allowClear: props.allowClear !== false
+    })), allowScan && isH5 && /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(ScanOutlined, null),
+      onClick: handleScanClick,
+      style: {
+        borderTopLeftRadius: 0,
+        borderBottomLeftRadius: 0,
+        height: 'auto'
+      }
+    }));
+  };
+
+  // 组件挂载时初始化
+  useEffect(function () {
+    // 检查当前设备类型，使用 platform 判断
+    if (isH5) {
+      // 移动设备初始化逻辑
+      if (isDevelopEnv) {
+        console.log('[Input.WithMode] 当前平台: H5');
+        window.__DEBUG_INPUT_PROPS__ = props;
+
+        // 添加全局测试函数
+        window.testPisellScan = function () {
+          console.log('测试扫码功能');
+          setScanVisible(true);
+        };
+
+        // 输出所有重要的状态和配置
+        console.log('组件初始化配置:', {
+          allowScan: allowScan,
+          scanCodeType: scanCodeType,
+          formats: formats
+        });
+      }
+
+      // 设置原生扫码回调
+      window.handleScanCallback = function (result) {
+        if (isDevelopEnv) {
+          console.log('接收到原生扫码结果:', result);
+        }
+        handleScan(result);
+      };
+    } else {
+      if (isDevelopEnv) {
+        console.log('[Input.WithMode] 当前平台: PC');
+        window.__DEBUG_INPUT_PROPS__ = props;
+      }
+    }
+    return function () {
+      // 清理全局函数
+      window.handleScanCallback = undefined;
+      window.testPisellScan = undefined;
+    };
+  }, [platform, allowScan, scanCodeType, formats]);
+
+  // 监听全屏事件
+  useEffect(function () {
+    var handleFullscreenChange = function handleFullscreenChange() {
+      if (!document.fullscreenElement && fullScreenMode) {
+        var _scanRef$current4;
+        // 用户通过其他方式退出了全屏
+        setFullScreenMode(false);
+        setScanVisible(false);
+        (_scanRef$current4 = scanRef.current) === null || _scanRef$current4 === void 0 || (_scanRef$current4 = _scanRef$current4.codeReader) === null || _scanRef$current4 === void 0 || _scanRef$current4.reset();
+      }
+    };
+    document.addEventListener('fullscreenchange', handleFullscreenChange);
+    return function () {
+      return document.removeEventListener('fullscreenchange', handleFullscreenChange);
+    };
+  }, [fullScreenMode]);
+
+  // 扫码类型变化时，更新标题
+  useEffect(function () {
+    if (isDevelopEnv) {
+      console.log('[Input.WithMode] 扫码类型变化:', scanCodeType, '标题文本:', getScanTypeText);
+    }
+  }, [scanCodeType, getScanTypeText]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CustomInput, null), allowScan && isH5 && scanVisible && /*#__PURE__*/React.createElement("div", {
+    ref: scanContainerRef,
+    style: {
+      position: fullScreenMode ? 'fixed' : 'absolute',
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0,
+      backgroundColor: '#000',
+      zIndex: 9999,
+      display: 'flex',
+      flexDirection: 'column'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: '10px 15px',
+      backgroundColor: '#fff',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: '16px',
+      fontWeight: 'bold'
+    }
+  }, getScanTypeText || 'Scan QR Code/Barcode'), /*#__PURE__*/React.createElement("span", {
+    onClick: exitFullScreenScan,
+    style: {
+      cursor: 'pointer',
+      fontSize: '24px'
+    }
+  }, "\xD7")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      position: 'relative'
+    }
+  }, /*#__PURE__*/React.createElement(PisellScan, {
+    width: "100%",
+    height: "100%",
+    onChange: handleScan,
+    timeBetweenScansMillis: 1000,
+    ref: scanRef,
+    formats: formats,
+    preferFrontCamera: false // 使用后置摄像头
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: '15px',
+      backgroundColor: '#fff',
+      display: 'flex',
+      justifyContent: 'center',
+      borderTop: '1px solid #f0f0f0'
+    }
+  }, /*#__PURE__*/React.createElement(Upload, {
+    accept: "image/*",
+    showUploadList: false,
+    beforeUpload: handleImageSelect,
+    style: {
+      marginRight: '15px'
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    icon: /*#__PURE__*/React.createElement(PictureOutlined, null),
+    style: {
+      marginRight: '15px'
+    }
+  }, getFromAlbumText || 'From Album')), /*#__PURE__*/React.createElement(Button, {
+    icon: /*#__PURE__*/React.createElement(ArrowLeftOutlined, null),
+    onClick: exitFullScreenScan
+  }, getBackText || 'Back'))));
 };
-var InputWithMode = withMode(Input, ReadPretty);
-export default InputWithMode;
+export default withMode(Input, ReadPretty);

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

@@ -1,14 +1,27 @@
+import React from 'react';
+import { withFormItem } from "../../dataSourceForm/utils";
+import InputWithMode from "./WithMode";
 import JSON from "../Input.Json";
 import Password from "../Input.Password";
 import TextArea from "../Input.TextArea";
 import Url from "../Input.Url";
 import Email from "../Input.Email";
-import Phone from "../Input.Phone"; //固定电话组件
-import Mobile from "../Input.Mobile"; //手机号组件
-import Subdomain from "../Input.Subdomain"; //子域名组件
-import InputWithMode from "./WithMode";
-import { withFormItem } from "../../dataSourceForm/utils";
-var Input = withFormItem(InputWithMode);
+import Phone from "../Input.Phone";
+import Mobile from "../Input.Mobile";
+import Subdomain from "../Input.Subdomain";
+// 修改 withFormItem 调用，确保属性传递
+var InputWithForm = withFormItem(InputWithMode, {
+  innerProps: {
+    // 要传递的属性，移除allowScan
+    scanCodeType: undefined,
+    language: undefined
+  }
+});
+
+// 简化组件，直接传递属性
+var Input = function Input(props) {
+  return /*#__PURE__*/React.createElement(InputWithForm, props);
+};
 Input.JSON = JSON;
 Input.Password = Password;
 Input.TextArea = TextArea;

package/es/components/pisellScan/index.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 = ["width", "height", "borderRadius", "style", "children", "onChange", "timeBetweenScansMillis"];
+var _excluded = ["width", "height", "borderRadius", "style", "children", "onChange", "timeBetweenScansMillis", "formats"];
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -11,6 +11,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
 import { BrowserMultiFormatReader, NotFoundException } from '@zxing/library';
 import "./index.less";
+
+// 添加导入JSX命名空间解决JSX类型问题
+
 /**
  * 二维码条形码扫描组件
  */
@@ -23,6 +26,7 @@ var PisellScan = /*#__PURE__*/forwardRef(function (props, ref) {
     onChange = props.onChange,
     _props$timeBetweenSca = props.timeBetweenScansMillis,
     timeBetweenScansMillis = _props$timeBetweenSca === void 0 ? 500 : _props$timeBetweenSca,
+    formats = props.formats,
     others = _objectWithoutProperties(props, _excluded);
   var videoRef = useRef(null);
   var codeReaderRef = useRef(null);
@@ -32,7 +36,12 @@ var PisellScan = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   });
   useEffect(function () {
-    var codeReader = new BrowserMultiFormatReader(undefined, timeBetweenScansMillis);
+    // 使用传入的formats参数初始化扫码器
+    var hints = new Map();
+    if (formats && formats.length > 0) {
+      hints.set(2, formats); // 2 对应 DecodeHintType.POSSIBLE_FORMATS
+    }
+    var codeReader = new BrowserMultiFormatReader(hints, timeBetweenScansMillis);
     // 将 codeReader 实例保存到 ref 对象中
     codeReaderRef.current = codeReader;
     var selectedDeviceId;
@@ -44,7 +53,12 @@ var PisellScan = /*#__PURE__*/forwardRef(function (props, ref) {
       codeReader.decodeFromVideoDevice(null, videoRef.current, function (result, err) {
         // 如果解码成功，调用 onChange 回调并传递解码结果的文本
         if (result) {
-          onChange === null || onChange === void 0 || onChange(result.getText());
+          var _barcodeFormat = result.getBarcodeFormat();
+          // 判断识别出的码类型是否在允许的格式列表中
+          var _isValidType = !formats || formats.length === 0 || formats.includes(_barcodeFormat);
+
+          // 回调中返回更多信息
+          onChange === null || onChange === void 0 || onChange(result.getText(), _barcodeFormat, _isValidType);
         }
         // 如果解码出错且错误不是 NotFoundException，则输出错误到控制台
         if (err && !(err instanceof NotFoundException)) {