@arim-aisdc/public-components 2.0.1 → 2.0.2

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/QueryFilter/QueryFilter.js

@@ -59,7 +59,10 @@ var QueryFilter = function QueryFilter(_ref) {
   var displayRender = function displayRender(labels) {
     return labels[labels.length - 1];
   };
-
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isCancel = _useState4[0],
+    setIsCancel = _useState4[1];
   // 处理初始值格式问题，主要是日期数据的格式，字符串处理为date格式
   var getHandledInitValues = function getHandledInitValues() {
     var newFormValues = {};
@@ -82,6 +85,17 @@ var QueryFilter = function QueryFilter(_ref) {
 
   /**初始化表单 */
   var FormRef = useRef(null);
+  useEffect(function () {
+    // 修改 重置时set初始值
+    if (isCancel) {
+      var handledInitValues = getHandledInitValues();
+      if (FormRef && FormRef.current) {
+        FormRef.current.setFieldsValue(handledInitValues);
+      }
+      setFormValues(handledInitValues);
+      setIsCancel(false);
+    }
+  }, [isCancel, initialValues]);
   useEffect(function () {
     /**回显异步初始值 */
     // FormRef && FormRef.current && FormRef.current.resetFields();
@@ -93,7 +107,7 @@ var QueryFilter = function QueryFilter(_ref) {
 
     // 更新表单数据
     setFormValues(handledInitValues);
-  }, [initialValues]);
+  }, []);
 
   // 表单提交时保留数据
   var onFinish = function onFinish(values) {
@@ -606,6 +620,7 @@ var QueryFilter = function QueryFilter(_ref) {
             onClick: function onClick(e) {
               handleCancel(e);
               form.resetFields();
+              setIsCancel(true);
               // 重置后 再次筛选 会带有上一次的记录（修改）
               setFormValues({});
             },
@@ -639,7 +654,7 @@ var QueryFilter = function QueryFilter(_ref) {
  * @returns
  */
 export function useDynamicSearchFiled(searchField, dynamicField) {
-  var _useState3 = useState(function () {
+  var _useState5 = useState(function () {
       return searchField.map(function (item) {
         var tartget = dynamicField.find(function (dynamicFieldItem) {
           return dynamicFieldItem.field === item.field;
@@ -673,7 +688,7 @@ export function useDynamicSearchFiled(searchField, dynamicField) {
                     err = _yield$to2[0];
                     data = _yield$to2[1];
                     if (!err) {
-                      _items = data.items || data || [];
+                      _items = (data === null || data === void 0 ? void 0 : data.items) || data || [];
                       _settingList = this === null || this === void 0 ? void 0 : this.settingHandler(_items || []);
                     }
                     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -701,9 +716,9 @@ export function useDynamicSearchFiled(searchField, dynamicField) {
         return item;
       });
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    wrapSearchField = _useState4[0],
-    setWrapSearchField = _useState4[1];
+    _useState6 = _slicedToArray(_useState5, 2),
+    wrapSearchField = _useState6[0],
+    setWrapSearchField = _useState6[1];
   return wrapSearchField;
 }
 export default /*#__PURE__*/React.memo(QueryFilter);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",