@jiaozhiye/qm-design-react 1.0.0-beta.21 → 1.0.0-beta.22

package/lib/form/src/form.d.ts

@@ -111,6 +111,7 @@ declare class QmForm extends Component<IProps, IState> {
         type: any;
         fieldName: any;
     }): boolean;
+    formatFormValue: (values: IFormData) => IFormData;
     getFormAuth(): Promise<void>;
     INPUT(option: IFormItem): JSXElement;
     RANGE_INPUT(option: IFormItem): JSXElement;

package/lib/form/src/utils.d.ts

@@ -1,6 +1,7 @@
 import dayjs, { Dayjs } from 'dayjs';
 export declare const getDate: (dateString: string | undefined, format: string) => dayjs.Dayjs | null;
 export declare const formatDate: (date: Dayjs | null, format: string) => string;
+export declare const isEmptyValue: (value: unknown) => boolean;
 export declare const deepMapList: (list: any[], valueKey: string, textKey: string) => any[];
 export declare const deepFind: (arr: any[], mark: string) => any;
 export declare const deepFindValues: <T>(arr: T[], str: string, depth?: number) => T[];

package/lib/index.esm.js

@@ -19,7 +19,7 @@ import 'dayjs/locale/zh-cn';
 import zhCN_antd from 'antd/lib/locale/zh_CN';
 import enGB_antd from 'antd/lib/locale/en_GB';
 import omit from 'omit.js';
-import { isNumber, isArray, isPlainObject, isFunction as isFunction$1, isUndefined, isString, throttle, xor, isEqual, get, merge, debounce, transform, set, intersection, cloneDeep, map, groupBy, flatten, spread, mergeWith, sumBy, maxBy, minBy, pickBy } from 'lodash-es';
+import { isArray, isPlainObject, isNumber, isFunction as isFunction$1, isUndefined, isString, throttle, xor, isEqual, get, merge, debounce, transform, set, intersection, cloneDeep, map, groupBy, flatten, spread, mergeWith, sumBy, maxBy, minBy, pickBy } from 'lodash-es';
 import classNames from 'classnames';
 import { UpOutlined, DownOutlined, DownloadOutlined, FullscreenExitOutlined, FullscreenOutlined, HolderOutlined, UnorderedListOutlined, SearchOutlined, CheckOutlined, CloseOutlined, ExclamationCircleOutlined, ReloadOutlined, UploadOutlined, ZoomInOutlined, ZoomOutOutlined, RotateRightOutlined, RotateLeftOutlined, PlusOutlined, InfoCircleFilled, PrinterOutlined, SettingOutlined, CheckSquareOutlined, CloseCircleOutlined, PieChartOutlined, FunnelPlotOutlined, StepBackwardOutlined, StepForwardOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import CountUp from 'react-countup';
@@ -3046,6 +3046,66 @@ var removeResizeListener = function removeResizeListener(element, fn) {
   }
 };
 
+dayjs.extend(advancedFormat);
+dayjs.extend(customParseFormat);
+var getDate$1 = function getDate(dateString, format) {
+  return dateString ? dayjs(dateString, format) : null;
+};
+var formatDate$1 = function formatDate(date, format) {
+  return date ? dayjs(date).format(format) : '';
+};
+var isEmptyValue = function isEmptyValue(value) {
+  return value === undefined || value === null;
+};
+var deepMapList = function deepMapList(list, valueKey, textKey) {
+  return list.map(function (x) {
+    var item = {
+      value: x[valueKey],
+      text: x[textKey]
+    };
+    x.disabled && (item.disabled = true);
+
+    if (Array.isArray(x.children)) {
+      item.children = deepMapList(x.children, valueKey, textKey);
+    }
+
+    return item;
+  });
+};
+var deepFind = function deepFind(arr, mark) {
+  var res = null;
+
+  for (var i = 0; i < arr.length; i++) {
+    if (Array.isArray(arr[i].children)) {
+      res = deepFind(arr[i].children, mark);
+    }
+
+    if (res) {
+      return res;
+    }
+
+    if (arr[i].value === mark) {
+      return arr[i];
+    }
+  }
+
+  return res;
+};
+var deepFindValues = function deepFindValues(arr, str) {
+  var depth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var result = [];
+  arr.forEach(function (x) {
+    if (x.value == str.split(',')[depth]) {
+      result.push(x);
+    }
+
+    if (Array.isArray(x.children)) {
+      result.push.apply(result, _toConsumableArray(deepFindValues(x.children, str, depth + 1)));
+    }
+  });
+  return result;
+};
+
 /*
  * @Author: 焦质晔
  * @Date: 2021-08-07 21:32:01
@@ -3994,23 +4054,27 @@ var RangeInputNumber = /*#__PURE__*/function (_Component) {
 
     _this = _super.apply(this, arguments);
 
+    _this.validateValues = function (values) {
+      // 结束值 不能大于 开始值
+      if (values.every(function (x) {
+        return x !== null;
+      }) && values[0] > values[1]) {
+        values[1] = values[0];
+      }
+
+      _this.triggerChange(values);
+    };
+
     _this.triggerChange = function (changedValue) {
       var _this$props = _this.props,
           _this$props$onChange = _this$props.onChange,
           onChange = _this$props$onChange === void 0 ? noop$1 : _this$props$onChange,
           onValuesChange = _this$props.onValuesChange;
-      changedValue = changedValue.every(function (x) {
+      var values = changedValue.every(function (x) {
         return x === null;
-      }) ? [] : changedValue; // 结束值 不能大于 开始值
-
-      if (changedValue.every(function (x) {
-        return x !== null;
-      }) && changedValue[0] > changedValue[1]) {
-        changedValue[1] = changedValue[0];
-      }
-
-      onChange(changedValue);
-      onValuesChange(changedValue);
+      }) ? [] : _toConsumableArray(changedValue);
+      onChange(values);
+      onValuesChange(values);
     };
 
     return _this;
@@ -4063,6 +4127,9 @@ var RangeInputNumber = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         onChange: function onChange(val) {
           _this2.triggerChange([val, value[1]]);
+        },
+        onBlur: function onBlur() {
+          _this2.validateValues(value);
         }
       }), /*#__PURE__*/React__default.createElement(Input, {
         className: "site-input-split",
@@ -4098,6 +4165,9 @@ var RangeInputNumber = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         onChange: function onChange(val) {
           _this2.triggerChange([value[0], val]);
+        },
+        onBlur: function onBlur() {
+          _this2.validateValues(value);
         }
       }));
     }
@@ -4158,8 +4228,7 @@ var FormRangeInputNumber = /*#__PURE__*/function (_Component2) {
         }
       }, /*#__PURE__*/React__default.createElement(RangeInputNumber, {
         option: this.props.option,
-        onValuesChange: function onValuesChange() {
-          var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+        onValuesChange: function onValuesChange(values) {
           onChange(values);
           $$form.setViewValue(fieldName, values.join('-'));
         }
@@ -5618,63 +5687,6 @@ var FormTextArea = /*#__PURE__*/function (_Component) {
 
 FormTextArea.contextType = FormContext;
 
-dayjs.extend(advancedFormat);
-dayjs.extend(customParseFormat);
-var getDate$1 = function getDate(dateString, format) {
-  return dateString ? dayjs(dateString, format) : null;
-};
-var formatDate$1 = function formatDate(date, format) {
-  return date ? dayjs(date).format(format) : '';
-};
-var deepMapList = function deepMapList(list, valueKey, textKey) {
-  return list.map(function (x) {
-    var item = {
-      value: x[valueKey],
-      text: x[textKey]
-    };
-    x.disabled && (item.disabled = true);
-
-    if (Array.isArray(x.children)) {
-      item.children = deepMapList(x.children, valueKey, textKey);
-    }
-
-    return item;
-  });
-};
-var deepFind = function deepFind(arr, mark) {
-  var res = null;
-
-  for (var i = 0; i < arr.length; i++) {
-    if (Array.isArray(arr[i].children)) {
-      res = deepFind(arr[i].children, mark);
-    }
-
-    if (res) {
-      return res;
-    }
-
-    if (arr[i].value === mark) {
-      return arr[i];
-    }
-  }
-
-  return res;
-};
-var deepFindValues = function deepFindValues(arr, str) {
-  var depth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  var result = [];
-  arr.forEach(function (x) {
-    if (x.value == str.split(',')[depth]) {
-      result.push(x);
-    }
-
-    if (Array.isArray(x.children)) {
-      result.push.apply(result, _toConsumableArray(deepFindValues(x.children, str, depth + 1)));
-    }
-  });
-  return result;
-};
-
 var _disabledDate$1 = function disabledDate(current, _ref) {
   var _ref2 = _slicedToArray$1(_ref, 2),
       minDateTime = _ref2[0],
@@ -13831,7 +13843,53 @@ var QmForm = /*#__PURE__*/function (_Component) {
         result.push(x);
       });
       return result;
-    }); // 列定义
+    }); // 格式化表单数据
+
+    _this.formatFormValue = function (values) {
+      var _a, _b;
+
+      var _loop = function _loop(key) {
+        var val = values[key];
+
+        if (isEmptyValue(val)) {
+          values[key] = '';
+        }
+
+        if (Array.isArray(val)) {
+          val.forEach(function (x, i) {
+            if (isEmptyValue(x)) {
+              values[key][i] = '';
+            }
+          });
+        }
+
+        if (key.includes('|') && Array.isArray(val)) {
+          var _key$split = key.split('|'),
+              _key$split2 = _slicedToArray$1(_key$split, 2),
+              start = _key$split2[0],
+              end = _key$split2[1];
+
+          values[start] = (_a = val[0]) !== null && _a !== void 0 ? _a : '';
+          values[end] = (_b = val[1]) !== null && _b !== void 0 ? _b : '';
+        }
+      };
+
+      for (var key in values) {
+        _loop(key);
+      } // 筛选器 - 空值设置成 undefined
+
+
+      if (_this.isFilterType) {
+        for (var _key in values) {
+          if (isEmpty(values[_key])) {
+            values[_key] = undefined;
+          }
+        }
+      }
+
+      return values;
+    }; // 列定义
+
 
     _this.createFieldsDefine = function () {
       var _this$props = _this.props,
@@ -13874,7 +13932,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
     _this.finishHandle = function (values) {
       var _a, _b;
 
-      (_b = (_a = _this.props).onFinish) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign({}, _this.get_fields_other(), values));
+      (_b = (_a = _this.props).onFinish) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign({}, _this.get_fields_other(), _this.formatFormValue(values)));
     }; // 提交表单且数据验证失败后回调事件
 
 
@@ -13882,8 +13940,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
       _ref.values;
           var errorFields = _ref.errorFields;
 
-      var _a, _b; // this.formRef.current!.scrollToField(errorFields[0].name);
-
+      var _a, _b;
 
       (_b = (_a = _this.props).onFinishFailed) === null || _b === void 0 ? void 0 : _b.call(_a, errorFields);
     }; // 获取表单的值，异步方法，错误前置的原则
@@ -13902,7 +13959,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
 
               case 3:
                 res = _context.sent;
-                return _context.abrupt("return", [null, Object.assign({}, this.get_fields_other(), res)]);
+                return _context.abrupt("return", [null, Object.assign({}, this.get_fields_other(), this.formatFormValue(res))]);
 
               case 7:
                 _context.prev = 7;
@@ -14217,7 +14274,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
 
       var result = [];
 
-      var _loop = function _loop(i, len) {
+      var _loop2 = function _loop2(i, len) {
         var index = _this3.formItems.findIndex(function (x) {
           return x === _this3.dividers[i];
         });
@@ -14236,7 +14293,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
       };
 
       for (var i = 0, len = this.dividers.length; i < len; i++) {
-        _loop(i);
+        _loop2(i);
       }
 
       return result;
@@ -14258,7 +14315,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
 
       var blockItems = this.getBlockDerivedItems();
 
-      var _loop2 = function _loop2(i, len) {
+      var _loop3 = function _loop3(i, len) {
         var arr = blockItems[i];
 
         var divider = _this4.dividers.find(function (x) {
@@ -14279,7 +14336,7 @@ var QmForm = /*#__PURE__*/function (_Component) {
       };
 
       for (var i = 0, len = blockItems.length; i < len; i++) {
-        var _ret = _loop2(i);
+        var _ret = _loop3(i);
 
         if (_typeof$2(_ret) === "object") return _ret.v;
       }
@@ -29976,7 +30033,7 @@ QmPrint.defaultProps = {
 QmPrint.contextType = ConfigContext;
 
 var name = "@jiaozhiye/qm-design-react";
-var version = "1.0.0-beta.21";
+var version = "1.0.0-beta.22";
 var description = "A Component Library for React";
 var keywords = [
 	"React",