iglooform 2.5.11 → 2.5.14

package/es/form/element/index.js

@@ -162,9 +162,16 @@ var Element = function Element(_ref) {
 
   useEffect(function () {
     if (!formItemProps.name || preview || !formItemProps.copiedValue.copied) return;
+    var originalValue = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
+    var value = formItemProps.copiedValue.value;
+
+    if (_typeof(originalValue) === 'object' && _typeof(value) === 'object') {
+      value = Object.assign(originalValue, formItemProps.copiedValue.value);
+    }
+
     form && form.setFields([{
       name: formItemProps.name,
-      value: formItemProps.copiedValue.value,
+      value: value,
       errors: []
     }]);
   }, [formItemProps.copiedValue.value]);

package/es/free-form/element/index.js

@@ -156,9 +156,16 @@ var Element = function Element(props) {
 
   useEffect(function () {
     if (!formItemProps.name || preview || !formItemProps.copiedValue.copied) return;
+    var originalValue = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
+    var value = formItemProps.copiedValue.value;
+
+    if (_typeof(originalValue) === 'object' && _typeof(value) === 'object') {
+      value = Object.assign(originalValue, formItemProps.copiedValue.value);
+    }
+
     form && form.setFields([{
       name: formItemProps.name,
-      value: formItemProps.copiedValue.value,
+      value: value,
       errors: []
     }]);
   }, [formItemProps.copiedValue.value]);

package/es/select/attached-select.js

@@ -43,7 +43,7 @@ import LocaleContext from '../locale/locale-context';
 import Button from '../button';
 import Input from '../input';
 import './style';
-import { compareOptions, optionsHOC } from '../utils/option-utils';
+import { compareOptions, compareSelected, optionsHOC } from '../utils/option-utils';
 var Option = _Select.Option,
     OptGroup = _Select.OptGroup;
 export { Option, OptGroup };
@@ -84,7 +84,7 @@ var IglooSelect = function IglooSelect(_ref) {
 
   var originOptions = useRef(options);
   useEffect(function () {
-    typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
+    typeof rest.onChange === 'function' && compareSelected(selected, valueProp) && rest.onChange(selected, selectedOptions);
   }, [selected]);
   useEffect(function () {
     valueProp !== selected && setSelected(valueProp);

package/es/select/select.js

@@ -59,7 +59,10 @@ var IglooSelect = function IglooSelect(_ref) {
   return _jsx(_Select, _objectSpread(_objectSpread({
     placeholder: placeholder || formatMessage({
       id: 'Please select'
-    })
+    }),
+    getPopupContainer: function getPopupContainer(trigger) {
+      return trigger.parentNode;
+    }
   }, omit(rest, formMethods)), {}, {
     options: children ? void 0 : options,
     value: value,
@@ -82,9 +85,6 @@ var IglooSelect = function IglooSelect(_ref) {
         }
       })]
     }),
-    getPopupContainer: function getPopupContainer(trigger) {
-      return trigger.parentNode;
-    },
     className: classnames('igloo-select', className),
     onDropdownVisibleChange: function onDropdownVisibleChange(open) {
       setOpen(open);

package/es/upload/index.js

@@ -566,7 +566,8 @@ var IglooUpload = function IglooUpload(props) {
       handleReUpload: handleReUpload,
       handlePreview: handlePreview,
       handleDelete: handleDelete,
-      containerRef: containerRef
+      containerRef: containerRef,
+      disabled: props.disabled
     })]
   });
 };
@@ -577,7 +578,8 @@ var FileList = function FileList(_ref7) {
       limit = _ref7.limit,
       handleDelete = _ref7.handleDelete,
       handlePreview = _ref7.handlePreview,
-      handleReUpload = _ref7.handleReUpload;
+      handleReUpload = _ref7.handleReUpload,
+      disabled = _ref7.disabled;
 
   var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -648,10 +650,10 @@ var FileList = function FileList(_ref7) {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleDelete(index);
+              return !disabled && handleDelete(index);
             }
           })]
         }), status === 'failed' && _jsxs("div", {
@@ -660,20 +662,20 @@ var FileList = function FileList(_ref7) {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleReUpload(index);
+              return !disabled && handleReUpload(index);
             },
             className: 'igloo-upload-preview-item-operation-left-icon'
           }), _jsx(CrossOutlined, {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleDelete(index);
+              return !disabled && handleDelete(index);
             }
           })]
         })]

package/es/upload-photo/index.d.ts

@@ -17,6 +17,7 @@ export interface Props extends IglooComponentProps {
     id?: string;
     bizKey?: string;
     capture?: boolean;
+    disabled?: boolean;
 }
 export declare type Sample = {
     src: string;

package/es/upload-photo/index.js

@@ -721,6 +721,10 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var getBadge = function getBadge(status, index, limit) {
+    if (props.disabled) {
+      return null;
+    }
+
     if (status === 'progress') {
       return _jsx("div", {
         children: _jsx(LoadingOutlined, {

package/es/utils/option-utils.d.ts

@@ -3,6 +3,7 @@ import { FormInstance } from 'antd/es/form';
 import { NamePath } from 'antd/es/form/interface';
 import { SelectProps, SelectValue } from 'antd/es/select';
 export declare const compareOptions: (newOptions: any[], oldOptions?: any[] | undefined) => boolean;
+export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
 declare type Options = SelectProps<SelectValue>['options'];
 export interface HOCProps extends IglooComponentProps {
     options?: Options;

package/es/utils/option-utils.js

@@ -14,8 +14,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 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); }); }; }
@@ -36,6 +34,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState, useContext, useRef } from 'react';
 import FormContext from '../form-context';
@@ -62,6 +62,25 @@ export var compareOptions = function compareOptions(newOptions, oldOptions) {
 
   return false;
 };
+export var compareSelected = function compareSelected(newValue, oldValue) {
+  if (_typeof(newValue) !== _typeof(oldValue)) {
+    return true;
+  }
+
+  if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+    if (newValue.length !== oldValue.length) {
+      return true;
+    }
+
+    return !newValue.every(function (v) {
+      return oldValue.find(function (ov) {
+        return v === ov;
+      });
+    });
+  }
+
+  return newValue !== oldValue;
+};
 export function optionsHOC(Component) {
   return function (props) {
     var options = props.options,

package/lib/form/element/index.js

@@ -191,9 +191,16 @@ var Element = function Element(_ref) {
 
   (0, _react.useEffect)(function () {
     if (!formItemProps.name || preview || !formItemProps.copiedValue.copied) return;
+    var originalValue = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
+    var value = formItemProps.copiedValue.value;
+
+    if (_typeof(originalValue) === 'object' && _typeof(value) === 'object') {
+      value = Object.assign(originalValue, formItemProps.copiedValue.value);
+    }
+
     form && form.setFields([{
       name: formItemProps.name,
-      value: formItemProps.copiedValue.value,
+      value: value,
       errors: []
     }]);
   }, [formItemProps.copiedValue.value]);

package/lib/free-form/element/index.js

@@ -182,9 +182,16 @@ var Element = function Element(props) {
 
   (0, _react.useEffect)(function () {
     if (!formItemProps.name || preview || !formItemProps.copiedValue.copied) return;
+    var originalValue = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
+    var value = formItemProps.copiedValue.value;
+
+    if (_typeof(originalValue) === 'object' && _typeof(value) === 'object') {
+      value = Object.assign(originalValue, formItemProps.copiedValue.value);
+    }
+
     form && form.setFields([{
       name: formItemProps.name,
-      value: formItemProps.copiedValue.value,
+      value: value,
       errors: []
     }]);
   }, [formItemProps.copiedValue.value]);

package/lib/select/attached-select.js

@@ -108,7 +108,7 @@ var IglooSelect = function IglooSelect(_ref) {
 
   var originOptions = (0, _react.useRef)(options);
   (0, _react.useEffect)(function () {
-    typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
+    typeof rest.onChange === 'function' && (0, _optionUtils.compareSelected)(selected, valueProp) && rest.onChange(selected, selectedOptions);
   }, [selected]);
   (0, _react.useEffect)(function () {
     valueProp !== selected && setSelected(valueProp);

package/lib/select/select.js

@@ -79,7 +79,10 @@ var IglooSelect = function IglooSelect(_ref) {
   return (0, _jsxRuntime.jsx)(_select.default, _objectSpread(_objectSpread({
     placeholder: placeholder || formatMessage({
       id: 'Please select'
-    })
+    }),
+    getPopupContainer: function getPopupContainer(trigger) {
+      return trigger.parentNode;
+    }
   }, (0, _omit.default)(rest, _formMethods.default)), {}, {
     options: children ? void 0 : options,
     value: value,
@@ -102,9 +105,6 @@ var IglooSelect = function IglooSelect(_ref) {
         }
       })]
     }),
-    getPopupContainer: function getPopupContainer(trigger) {
-      return trigger.parentNode;
-    },
     className: (0, _classnames.default)('igloo-select', className),
     onDropdownVisibleChange: function onDropdownVisibleChange(open) {
       setOpen(open);

package/lib/upload/index.js

@@ -592,7 +592,8 @@ var IglooUpload = function IglooUpload(props) {
       handleReUpload: handleReUpload,
       handlePreview: handlePreview,
       handleDelete: handleDelete,
-      containerRef: containerRef
+      containerRef: containerRef,
+      disabled: props.disabled
     })]
   });
 };
@@ -603,7 +604,8 @@ var FileList = function FileList(_ref7) {
       limit = _ref7.limit,
       handleDelete = _ref7.handleDelete,
       handlePreview = _ref7.handlePreview,
-      handleReUpload = _ref7.handleReUpload;
+      handleReUpload = _ref7.handleReUpload,
+      disabled = _ref7.disabled;
 
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -673,10 +675,10 @@ var FileList = function FileList(_ref7) {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleDelete(index);
+              return !disabled && handleDelete(index);
             }
           })]
         }), status === 'failed' && (0, _jsxRuntime.jsxs)("div", {
@@ -685,20 +687,20 @@ var FileList = function FileList(_ref7) {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleReUpload(index);
+              return !disabled && handleReUpload(index);
             },
             className: 'igloo-upload-preview-item-operation-left-icon'
           }), (0, _jsxRuntime.jsx)(_iglooicon.CrossOutlined, {
             style: {
               fontSize: 24,
               color: '#999999',
-              cursor: 'pointer'
+              cursor: disabled ? 'default' : 'pointer'
             },
             onClick: function onClick() {
-              return handleDelete(index);
+              return !disabled && handleDelete(index);
             }
           })]
         })]

package/lib/upload-photo/index.d.ts

@@ -17,6 +17,7 @@ export interface Props extends IglooComponentProps {
     id?: string;
     bizKey?: string;
     capture?: boolean;
+    disabled?: boolean;
 }
 export declare type Sample = {
     src: string;

package/lib/upload-photo/index.js

@@ -755,6 +755,10 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var getBadge = function getBadge(status, index, limit) {
+    if (props.disabled) {
+      return null;
+    }
+
     if (status === 'progress') {
       return (0, _jsxRuntime.jsx)("div", {
         children: (0, _jsxRuntime.jsx)(_iglooicon.LoadingOutlined, {

package/lib/utils/option-utils.d.ts

@@ -3,6 +3,7 @@ import { FormInstance } from 'antd/es/form';
 import { NamePath } from 'antd/es/form/interface';
 import { SelectProps, SelectValue } from 'antd/es/select';
 export declare const compareOptions: (newOptions: any[], oldOptions?: any[] | undefined) => boolean;
+export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
 declare type Options = SelectProps<SelectValue>['options'];
 export interface HOCProps extends IglooComponentProps {
     options?: Options;

package/lib/utils/option-utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compareOptions = void 0;
+exports.compareSelected = exports.compareOptions = void 0;
 exports.optionsHOC = optionsHOC;
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -32,8 +32,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 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); }); }; }
@@ -54,6 +52,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 var compareOptions = function compareOptions(newOptions, oldOptions) {
   if (!Array.isArray(oldOptions)) {
     return true;
@@ -79,6 +79,28 @@ var compareOptions = function compareOptions(newOptions, oldOptions) {
 
 exports.compareOptions = compareOptions;
 
+var compareSelected = function compareSelected(newValue, oldValue) {
+  if (_typeof(newValue) !== _typeof(oldValue)) {
+    return true;
+  }
+
+  if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+    if (newValue.length !== oldValue.length) {
+      return true;
+    }
+
+    return !newValue.every(function (v) {
+      return oldValue.find(function (ov) {
+        return v === ov;
+      });
+    });
+  }
+
+  return newValue !== oldValue;
+};
+
+exports.compareSelected = compareSelected;
+
 function optionsHOC(Component) {
   return function (props) {
     var options = props.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.11",
+  "version": "2.5.14",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",