iglooform 2.4.25 → 2.4.28

package/es/filter/index.js

@@ -616,15 +616,15 @@ var FilterComponent = function FilterComponent(props) {
               fontSize: '24px',
               color: '#666666'
             }
-          }, void 0), _jsx(Typography, {
+          }), _jsx(Typography, {
             level: "h4",
             children: filterTitle
-          }, void 0)]
-        }, void 0), _jsx(_Divider, {
+          })]
+        }), _jsx(_Divider, {
           style: {
             margin: '16px 0px'
           }
-        }, void 0), filterItems.map(function (item) {
+        }), filterItems.map(function (item) {
           var type = item.type,
               options = item.options,
               filterItemTitle = item.filterItemTitle,
@@ -698,7 +698,7 @@ var FilterComponent = function FilterComponent(props) {
               }, key);
           }
         })]
-      }, void 0), _jsxs("div", {
+      }), _jsxs("div", {
         className: "igloo-form-filter-drop-down-footer",
         onClick: function onClick(e) {
           return e.stopPropagation();
@@ -718,8 +718,8 @@ var FilterComponent = function FilterComponent(props) {
             children: formatMessage({
               id: 'Reset All Filters'
             })
-          }, void 0)
-        }, void 0), _jsxs(_Space, {
+          })
+        }), _jsxs(_Space, {
           size: 16,
           children: [_jsx("span", {
             onClick: function onClick() {
@@ -735,8 +735,8 @@ var FilterComponent = function FilterComponent(props) {
               children: formatMessage({
                 id: 'Cancel'
               })
-            }, void 0)
-          }, void 0), _jsx(_Button, {
+            })
+          }), _jsx(_Button, {
             onClick: function onClick() {
               setDropVisible(false);
               setShowSearchInputDefault(false);
@@ -763,12 +763,12 @@ var FilterComponent = function FilterComponent(props) {
               children: formatMessage({
                 id: 'Apply'
               })
-            }, void 0)
-          }, void 0)]
-        }, void 0)]
-      }, void 0)]
+            })
+          })]
+        })]
+      })]
     }, 1)
-  }, void 0);
+  });
 
   return _jsxs("div", {
     className: "".concat(showIdSelect ? 'igloo-form-filter-with-select' : 'igloo-form-filter'),
@@ -780,7 +780,7 @@ var FilterComponent = function FilterComponent(props) {
         padding: '0px',
         border: '0px'
       }
-    }, void 0), showIdSelect && idKeyTypes.length !== 0 && _jsx(Select, {
+    }), showIdSelect && idKeyTypes.length !== 0 && _jsx(Select, {
       className: "igloo-form-filter-id-select",
       onChange: function onChange(e) {
         return setIdName(String(e));
@@ -790,17 +790,17 @@ var FilterComponent = function FilterComponent(props) {
         style: {
           fontSize: 24
         }
-      }, void 0),
+      }),
       children: idKeyTypes.map(function (item) {
         return _jsx(Option, {
           value: item.value,
           children: _jsx(Typography, {
             level: "body1",
             children: item.label
-          }, void 0)
+          })
         }, item.value);
       })
-    }, void 0), (hightLightFilterButton || showDefaultOptions || stillHaveTagsToDelete) && !noFilters && !showSearchInputDefault && !showSearchInputWhenHasTag ? _jsxs("div", {
+    }), (hightLightFilterButton || showDefaultOptions || stillHaveTagsToDelete) && !noFilters && !showSearchInputDefault && !showSearchInputWhenHasTag ? _jsxs("div", {
       className: "igloo-filter-tag-position-reference",
       children: [_jsxs("div", {
         ref: heightRef,
@@ -819,7 +819,7 @@ var FilterComponent = function FilterComponent(props) {
         },
         children: [_jsx(SearchOutlined, {
           className: 'search-icon'
-        }, void 0), _jsxs(_Space, {
+        }), _jsxs(_Space, {
           size: [12, 8],
           className: "tag-container",
           style: {
@@ -831,7 +831,7 @@ var FilterComponent = function FilterComponent(props) {
               children: [_jsx(Typography, {
                 level: "body3",
                 children: item.label
-              }, void 0), !item.canNotDelete && _jsx(CrossOutlined, {
+              }), !item.canNotDelete && _jsx(CrossOutlined, {
                 className: "delete-icon",
                 onClick: function onClick(e) {
                   e.stopPropagation();
@@ -863,12 +863,12 @@ var FilterComponent = function FilterComponent(props) {
 
                   deleteSomeOne(confirmed, item, [statusCallBack, handleFilter]);
                 }
-              }, void 0)]
+              })]
             }, index);
           }), !oneLineCanShow && !inputExtend && _jsx("span", {
             children: "..."
-          }, void 0)]
-        }, void 0), !onlyHaveCanNotDeleteTags && _jsx(CrossOutlined, {
+          })]
+        }), !onlyHaveCanNotDeleteTags && _jsx(CrossOutlined, {
           className: "delete-all-icon",
           onClick: function onClick(e) {
             e.stopPropagation();
@@ -895,8 +895,8 @@ var FilterComponent = function FilterComponent(props) {
               typeof parentFilterCallBack === 'function' && parentFilterCallBack(_objectSpread({}, afterDeleteValue));
             }
           }
-        }, void 0)]
-      }, void 0), _jsxs("div", {
+        })]
+      }), _jsxs("div", {
         ref: openStatusTagRef,
         className: classname('tag-extend-container-hide-status', {
           'igloo-form-filter-has-select-tag-container': showIdSelect,
@@ -915,7 +915,7 @@ var FilterComponent = function FilterComponent(props) {
         },
         children: [_jsx(SearchOutlined, {
           className: 'search-icon'
-        }, void 0), _jsx(_Space, {
+        }), _jsx(_Space, {
           size: [12, 8],
           className: "tag-container",
           style: {
@@ -927,7 +927,7 @@ var FilterComponent = function FilterComponent(props) {
               children: [_jsx(Typography, {
                 level: "body3",
                 children: item.label
-              }, void 0), !item.canNotDelete && _jsx(CrossOutlined, {
+              }), !item.canNotDelete && _jsx(CrossOutlined, {
                 className: "delete-icon",
                 onClick: function onClick(e) {
                   e.stopPropagation();
@@ -959,10 +959,10 @@ var FilterComponent = function FilterComponent(props) {
 
                   deleteSomeOne(confirmed, item, [statusCallBack, handleFilter]);
                 }
-              }, void 0)]
+              })]
             }, index);
           })
-        }, void 0), !onlyHaveCanNotDeleteTags && _jsx(CrossOutlined, {
+        }), !onlyHaveCanNotDeleteTags && _jsx(CrossOutlined, {
           className: "delete-all-icon",
           onClick: function onClick() {
             setTimeRangeType(-1);
@@ -988,9 +988,9 @@ var FilterComponent = function FilterComponent(props) {
               typeof parentFilterCallBack === 'function' && parentFilterCallBack(_objectSpread({}, afterDeleteValue));
             }
           }
-        }, void 0)]
-      }, void 0)]
-    }, void 0) : _jsx(_Input, {
+        })]
+      })]
+    }) : _jsx(_Input, {
       ref: searchInput,
       value: searchInputValue,
       onChange: function onChange(e) {
@@ -1009,7 +1009,7 @@ var FilterComponent = function FilterComponent(props) {
           color: '#999999',
           marginRight: '12px'
         }
-      }, void 0),
+      }),
       className: "".concat(showIdSelect ? 'igloo-form-filter-has-select-input' : 'igloo-form-filter-default-input'),
       onPressEnter: function onPressEnter(e) {
         var value = undefined;
@@ -1031,7 +1031,7 @@ var FilterComponent = function FilterComponent(props) {
         onFilter(value);
         typeof parentFilterCallBack === 'function' && parentFilterCallBack(value);
       }
-    }, void 0), !inputOnly && _jsx(_Dropdown, {
+    }), !inputOnly && _jsx(_Dropdown, {
       getPopupContainer: function getPopupContainer() {
         return dropDownContainerRef.current;
       },
@@ -1039,7 +1039,7 @@ var FilterComponent = function FilterComponent(props) {
         style: {
           display: 'none'
         }
-      }, void 0),
+      }),
       placement: 'bottomLeft',
       overlayClassName: "igloo-form-filter-drop-down-container",
       visible: dropVisible,
@@ -1067,7 +1067,7 @@ var FilterComponent = function FilterComponent(props) {
             style: {
               fontSize: '24px'
             }
-          }, void 0),
+          }),
           onClick: function onClick() {
             setDropVisible(true);
           },
@@ -1078,15 +1078,15 @@ var FilterComponent = function FilterComponent(props) {
               children: formatMessage({
                 id: 'Filter'
               })
-            }, void 0)
-          }, void 0)
-        }, void 0)
-      }, void 0)
-    }, void 0), _jsx("div", {
+            })
+          })
+        })
+      })
+    }), _jsx("div", {
       className: "igloo-form-filter-drop-down",
       ref: dropDownContainerRef
-    }, void 0)]
-  }, void 0);
+    })]
+  });
 };
 
 export default FilterComponent;

package/es/filter/radioBox.js

@@ -23,8 +23,8 @@ var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
       children: _jsx(Typography, {
         level: "h4",
         children: title
-      }, void 0)
-    }, void 0), _jsx(_Radio.Group, {
+      })
+    }), _jsx(_Radio.Group, {
       value: chooseed,
       onChange: function onChange(e) {
         return valueConfirm({
@@ -43,16 +43,16 @@ var CreateRadioBoxFilter = function CreateRadioBoxFilter(props) {
               children: _jsx(Typography, {
                 level: "body1",
                 children: item.label
-              }, void 0)
-            }, void 0)
+              })
+            })
           }, item.value);
         })
-      }, void 0)
-    }, void 0), _jsx(_Divider, {
+      })
+    }), _jsx(_Divider, {
       style: {
         margin: '16px 0px'
       }
-    }, void 0)]
+    })]
   }, optionKey);
 };
 

package/es/filter/rangePicker.js

@@ -103,7 +103,7 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
 
   var rangeSeparate = _jsx("div", {
     className: "igloo-filter-date-picker-range-separate"
-  }, void 0);
+  });
 
   return _jsxs("div", {
     className: "igloo-form-filter-drop-down-container-content-group",
@@ -113,7 +113,7 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
         level: "h4",
         className: "igloo-form-filter-range-picker-label",
         children: title
-      }, void 0), _jsxs("div", {
+      }), _jsxs("div", {
         className: "igloo-form-filter-range-picker-container",
         children: [_jsx(RangePicker, {
           inputReadOnly: true,
@@ -147,12 +147,12 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
               color: '#666666',
               opacity: 0
             }
-          }, void 0) : _jsx(CalendarOutlined, {
+          }) : _jsx(CalendarOutlined, {
             style: {
               fontSize: '20px',
               color: '#666666'
             }
-          }, void 0),
+          }),
           panelRender: function panelRender(pa) {
             var customFinallyUse = dateRangeConfig.custom || [moment(), moment()];
             var customDisable = disabledDate(customFinallyUse[0]) || disabledDate(customFinallyUse[1]);
@@ -183,8 +183,8 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
                     children: formatMessage({
                       id: 'Custom'
                     })
-                  }, void 0)
-                }, void 0), _jsx("div", {
+                  })
+                }), _jsx("div", {
                   className: lastDayDisable ? 'igloo-form-filter-date-picker-top-diable' : '',
                   onClick: function onClick() {
                     if (lastDayDisable) return;
@@ -200,8 +200,8 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
                     children: formatMessage({
                       id: 'Last Day'
                     })
-                  }, void 0)
-                }, void 0), _jsx("div", {
+                  })
+                }), _jsx("div", {
                   className: lastSevenDaysDisable ? 'igloo-form-filter-date-picker-top-diable' : '',
                   onClick: function onClick() {
                     if (lastSevenDaysDisable) return;
@@ -217,8 +217,8 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
                     children: formatMessage({
                       id: 'Last 7 Days'
                     })
-                  }, void 0)
-                }, void 0), _jsx("div", {
+                  })
+                }), _jsx("div", {
                   className: lastMonthDisable ? 'igloo-form-filter-date-picker-top-diable' : '',
                   onClick: function onClick() {
                     if (lastMonthDisable) return;
@@ -234,8 +234,8 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
                     children: formatMessage({
                       id: 'Last Month'
                     })
-                  }, void 0)
-                }, void 0), _jsx("div", {
+                  })
+                }), _jsx("div", {
                   className: thisMonthDisable ? 'igloo-form-filter-date-picker-top-diable' : '',
                   onClick: function onClick() {
                     if (thisMonthDisable) return;
@@ -251,12 +251,12 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
                     children: formatMessage({
                       id: 'This Month'
                     })
-                  }, void 0)
-                }, void 0)]
-              }, void 0), pa]
-            }, void 0);
+                  })
+                })]
+              }), pa]
+            });
           }
-        }, void 0), pickerOpenStatus && _jsx("div", {
+        }), pickerOpenStatus && _jsx("div", {
           className: "igloo-form-filter-range-icon",
           children: _jsx(CalendarOutlined, {
             style: {
@@ -272,17 +272,17 @@ var CreateRangePickerFilter = function CreateRangePickerFilter(props) {
 
               onFocus.focus();
             }
-          }, void 0)
-        }, void 0), _jsx("div", {
+          })
+        }), _jsx("div", {
           ref: dateRangerContainerRef,
           className: "igloo-form-fliter-drop-down-container-content-group-title-ranger-container"
-        }, void 0)]
-      }, void 0)]
-    }, void 0), _jsx(_Divider, {
+        })]
+      })]
+    }), _jsx(_Divider, {
       style: {
         margin: '16px 0px'
       }
-    }, void 0)]
+    })]
   }, optionKey);
 };
 

package/es/filter/style/index.less

@@ -13,7 +13,10 @@
     height: 48px;
 
     .ant-select-selector {
-      border-color: #eeeeee;
+      &:hover {
+        border-color: #7373ff !important;
+      }
+      border-color: #eeeeee !important;
     }
   }
 }
@@ -71,7 +74,7 @@
   // input 框样式
   .igloo-form-filter-default-input {
     width: 600px;
-    border-radius: 3px 0px 0px 3px;
+    border-radius: 3px;
     padding: 12px 16px;
   }
 
@@ -126,6 +129,10 @@
 
     .igloo-form-filter-default-tag-container,
     .igloo-form-filter-has-select-tag-container {
+      &:hover {
+        border-color: #7373ff;
+      }
+
       border: 1px solid #eeeeee;
       display: flex;
 
@@ -171,6 +178,7 @@
     position: absolute;
     top: 0;
     right: 0;
+    background-color: white;
 
     .igloo-form-filter-filter-button {
       border-radius: 0px 3px 3px 0px;

package/es/form/addable-section/index.js

@@ -1,7 +1,11 @@
 import "antd/es/row/style";
 import _Row from "antd/es/row";
+import "antd/es/divider/style";
+import _Divider from "antd/es/divider";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
+import "antd/es/grid/style";
+import _Grid from "antd/es/grid";
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -29,7 +33,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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; }
 
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useReducer, useContext, useCallback } from 'react';
 import Element from '../element';
 import FormContext from '../../form-context';
@@ -38,6 +42,7 @@ import Typography from '../../typography';
 import Button from '../../button';
 import { LocaleContext } from '../../locale';
 import './style/index.less';
+var useBreakpoint = _Grid.useBreakpoint;
 
 var AddableSection = function AddableSection(_ref) {
   var parentName = _ref.parentName,
@@ -64,6 +69,9 @@ var AddableSection = function AddableSection(_ref) {
       addButtonText = config.addButtonText,
       addButtonIcon = config.addButtonIcon;
 
+  var _useBreakpoint = useBreakpoint(),
+      md = _useBreakpoint.md;
+
   var _useContext = useContext(LocaleContext),
       formatMessage = _useContext.formatMessage;
 
@@ -142,15 +150,19 @@ var AddableSection = function AddableSection(_ref) {
     var parentName = calcNamePath(namePath, index);
     return _jsxs(_Col, {
       span: 24,
-      className: 'igloo-freeform-addable-section',
-      children: [(groupKeys.length > min && !preview || label) && _jsxs(_Row, {
+      className: 'igloo-form-addable-section',
+      children: [index > 0 && _jsx(_Divider, {
+        style: {
+          margin: !md ? preview ? '16px 0 24px 0' : '24px 0' : preview ? '16px 0 24px' : '32px 0 24px 0'
+        }
+      }), (groupKeys.length > min && !preview || label) && _jsxs(_Row, {
         justify: "space-between",
         className: 'igloo-addable-section-label',
-        children: [label ? _jsxs(Typography, _objectSpread(_objectSpread({}, labelProps), {}, {
-          level: "h4",
+        children: [label ? _jsx(Typography, _objectSpread(_objectSpread({}, labelProps), {}, {
+          level: !md ? 'body1' : 'h3b',
           wrapElement: "div",
-          children: [label, " ", index + 1]
-        }), void 0) : _jsx("div", {}, void 0), groupKeys.length > min && !preview && _jsx(Button, {
+          children: label
+        })) : _jsx("div", {}), groupKeys.length > min && !preview && _jsx(Button, {
           type: "link",
           className: "igloo-addable-section-label-remove",
           onClick: function onClick() {
@@ -162,10 +174,13 @@ var AddableSection = function AddableSection(_ref) {
           children: formatMessage({
             id: 'Remove'
           })
-        }, void 0)]
-      }, void 0), _jsx("div", _objectSpread(_objectSpread({
-        className: 'igloo-freeform-addable-section-content'
+        })]
+      }), _jsx("div", _objectSpread(_objectSpread({
+        className: 'igloo-form-addable-section-content'
       }, contentProps), {}, {
+        style: {
+          marginTop: !md ? 16 : preview ? 16 : 24
+        },
         children: _jsx(_Row, {
           gutter: [32, preview ? 16 : 24],
           children: elements.map(function (child, index) {
@@ -177,19 +192,19 @@ var AddableSection = function AddableSection(_ref) {
               setShowStepButton: setShowStepButton
             }, index);
           })
-        }, void 0)
-      }), void 0)]
+        })
+      }))]
     }, key);
   });
   return _jsxs("div", {
-    className: "igloo-freeform-addable-section-container",
+    className: "igloo-form-addable-section-container",
     style: {
       width: '100%'
     },
     children: [groups, groupKeys.length < max && !preview && _jsx(_Col, {
       span: 24,
       style: {
-        marginTop: 16
+        marginTop: !md ? 24 : 32
       },
       children: _jsx(Button, {
         onClick: function onClick() {
@@ -198,14 +213,14 @@ var AddableSection = function AddableSection(_ref) {
             key: Date.now()
           });
         },
-        className: "igloo-addable-section-button",
+        className: "igloo-form-addable-section-button",
         icon: addButtonIcon,
         children: addButtonText || "".concat(formatMessage({
           id: 'Add'
         }), " ").concat(label)
-      }, void 0)
-    }, void 0)]
-  }, void 0);
+      })
+    })]
+  });
 };
 
 export default AddableSection;

package/es/form/addable-section/style/index.less

@@ -1,22 +1,18 @@
-.igloo-freeform-addable-section-container {
-  .igloo-freeform-addable-section {
-    .igloo-freeform-addable-section-label {
-      .igloo-freeform-addable-section-label-remove {
+.igloo-form-addable-section-container {
+  .igloo-form-addable-section {
+    .igloo-form-addable-section-label {
+      .igloo-form-addable-section-label-remove {
         height: auto;
         border: none;
       }
     }
 
-    .igloo-freeform-addable-section-content {
+    .igloo-form-addable-section-content {
       margin-top: 16px;
     }
-
-    & + .igloo-freeform-addable-section {
-      margin-top: 24px;
-    }
   }
 
-  .igloo-freeform-addable-section-button {
+  .igloo-form-addable-section-button {
     min-width: 221px;
   }
 }

package/es/form/divider/index.js

@@ -24,7 +24,7 @@ var DividerElement = function DividerElement(_ref) {
 
   return _jsx(_Divider, _objectSpread({
     className: classNames(className, 'igloo-form-divider')
-  }, omit(props, formMethods)), void 0);
+  }, omit(props, formMethods)));
 };
 
 DividerElement.formItemPropsHandler = function () {

package/es/form/element/index.js

@@ -157,7 +157,7 @@ var Element = function Element(_ref) {
       preview: preview,
       disabled: disabled,
       setShowStepButton: setShowStepButton
-    }, void 0);
+    });
   }
 
   if (type === 'AddableSection') {
@@ -167,7 +167,7 @@ var Element = function Element(_ref) {
       preview: preview,
       disabled: disabled,
       setShowStepButton: setShowStepButton
-    }, void 0);
+    });
   }
 
   var _calcFormItemProps = calcFormItemProps(config, _objectSpread(_objectSpread({}, extraConfig), {}, {
@@ -242,7 +242,7 @@ var Element = function Element(_ref) {
       return null;
     }
 
-    return hideWhenEdit ? null : _jsx(_Col, _objectSpread(_objectSpread({}, restColProps), {}, {
+    return hideWhenEdit || !display ? null : _jsx(_Col, _objectSpread(_objectSpread({}, restColProps), {}, {
       className: "igloo-form-item",
       children: _jsx("div", {
         style: {
@@ -258,9 +258,9 @@ var Element = function Element(_ref) {
           setShowStepButton: setShowStepButton,
           getFormInstance: getFormInstance,
           validateField: validateField
-        }), void 0)
-      }, void 0)
-    }), void 0);
+        }))
+      })
+    }));
   }
 
   if (!display) return null;
@@ -299,7 +299,7 @@ var Element = function Element(_ref) {
             xs: 24,
             className: "igloo-element-preview-label",
             children: previewLabel || label
-          }, void 0), _jsxs(_Col, {
+          }), _jsxs(_Col, {
             span: label ? 12 : 24,
             md: label ? 12 : 24,
             sm: 24,
@@ -307,13 +307,13 @@ var Element = function Element(_ref) {
             className: "igloo-element-preview-value",
             children: [error && !!error.length && _jsx(AlertFilled, {
               className: "igloo-element-preview-value-icon"
-            }, void 0), _jsx("div", {
+            }), _jsx("div", {
               children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
-            }, void 0)]
-          }, void 0)]
-        }, void 0)
-      }), void 0)
-    }, void 0);
+            })]
+          })]
+        })
+      }))
+    });
   }
 
   return config.hideWhenEdit ? null : _jsx(_Col, _objectSpread(_objectSpread({}, restColProps), {}, {
@@ -341,10 +341,10 @@ var Element = function Element(_ref) {
           setShowStepButton: setShowStepButton,
           getFormInstance: getFormInstance,
           validateField: validateField
-        }), void 0)
-      }), void 0)
-    }, void 0)
-  }), void 0);
+        }))
+      }))
+    })
+  }));
 };
 
 export default Element;