wargerm 0.3.10 → 0.3.13

package/dist/components/Select/index.d.ts

@@ -5,6 +5,7 @@ export interface IOptionProps extends OptionProps {
 export interface ISelect extends SelectProps<any> {
     request?: () => Promise<any>;
     valueEnum?: Record<string, any>;
+    params?: Record<string, any>;
     onLoad?: (options: Record<string, any>[]) => void;
 }
 export declare type IWSelectComponent = React.FC<ISelect> & {

package/dist/index.esm.js

@@ -496,12 +496,7 @@ WInputNumber.defaultProps = {};
 var WDatePicker = function WDatePicker(props) {
   var extraProps = _extends({}, props);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React.createElement(_DatePicker, _objectSpread2({}, extraProps)) // </ConfigProvider>
-
-  );
+  return /*#__PURE__*/React.createElement(_DatePicker, _objectSpread2({}, extraProps));
 };
 
 WDatePicker.defaultProps = {};
@@ -509,12 +504,7 @@ WDatePicker.defaultProps = {};
 var RangePicker = function RangePicker(props) {
   var extraProps = _extends({}, props);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React.createElement(_DatePicker.RangePicker, _objectSpread2({}, extraProps)) // </ConfigProvider>
-
-  );
+  return /*#__PURE__*/React.createElement(_DatePicker.RangePicker, _objectSpread2({}, extraProps));
 };
 
 RangePicker.defaultProps = {};
@@ -649,7 +639,7 @@ function FrameBox(_ref) {
   }), children);
 }
 
-var _excluded$2 = ["request", "valueEnum", "onLoad", "children"],
+var _excluded$2 = ["request", "valueEnum", "onLoad", "children", "params"],
     _excluded2 = ["children"];
 
 var WSelect = function WSelect(props) {
@@ -657,6 +647,7 @@ var WSelect = function WSelect(props) {
       valueEnum = props.valueEnum,
       onLoad = props.onLoad,
       children = props.children,
+      params = props.params,
       extraProps = _objectWithoutProperties(props, _excluded$2);
 
   var _useState = useState([]),
@@ -737,7 +728,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), JSON.stringify(request)]);
+  }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -6422,6 +6413,8 @@ var momentValue = function momentValue(value) {
   if (value) {
     return hooks(value);
   }
+
+  return value;
 };
 
 var WDatePicker$1 = function WDatePicker(props) {
@@ -6431,20 +6424,15 @@ var WDatePicker$1 = function WDatePicker(props) {
       _onChange = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded$3);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React.createElement(_DatePicker, _objectSpread2({
-      defaultValue: momentValue(defaultValue),
-      value: momentValue(value),
-      onChange: function onChange(v) {
-        var _momentValue;
-
-        (_onChange === null || _onChange === void 0 ? void 0 : _onChange(v, (_momentValue = momentValue(v)) === null || _momentValue === void 0 ? void 0 : _momentValue.format(format || 'YYYY-MM-DD'))) || '';
-      }
-    }, extraProps)) // </ConfigProvider>
+  return /*#__PURE__*/React.createElement(_DatePicker, _objectSpread2({
+    defaultValue: momentValue(defaultValue),
+    value: momentValue(value),
+    onChange: function onChange(v) {
+      var _momentValue2, _momentValue3;
 
-  );
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange((_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'), (_momentValue3 = momentValue(v)) === null || _momentValue3 === void 0 ? void 0 : _momentValue3.format(format || 'YYYY-MM-DD'));
+    }
+  }, extraProps));
 };
 
 WDatePicker$1.defaultProps = {};
@@ -6456,20 +6444,15 @@ var RangePicker$1 = function RangePicker(props) {
       _onChange2 = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded2$1);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React.createElement(_DatePicker.RangePicker, _objectSpread2({
-      defaultValue: momentValue(defaultValue),
-      value: momentValue(value),
-      onChange: function onChange(v) {
-        var _momentValue2;
-
-        (_onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, (_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'))) || '';
-      }
-    }, extraProps)) // </ConfigProvider>
+  return /*#__PURE__*/React.createElement(_DatePicker.RangePicker, _objectSpread2({
+    defaultValue: defaultValue ? [momentValue(defaultValue[0]), momentValue(defaultValue[1])] : undefined,
+    value: value ? [momentValue(value[0]), momentValue(value[1])] : undefined,
+    onChange: function onChange(v) {
+      var _momentValue4, _momentValue5, _momentValue6, _momentValue7;
 
-  );
+      _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2([((_momentValue4 = momentValue(v[0])) === null || _momentValue4 === void 0 ? void 0 : _momentValue4.format(format || 'YYYY-MM-DD')) || '', ((_momentValue5 = momentValue(v[1])) === null || _momentValue5 === void 0 ? void 0 : _momentValue5.format(format || 'YYYY-MM-DD')) || ''], [((_momentValue6 = momentValue(v[0])) === null || _momentValue6 === void 0 ? void 0 : _momentValue6.format(format || 'YYYY-MM-DD')) || '', ((_momentValue7 = momentValue(v[1])) === null || _momentValue7 === void 0 ? void 0 : _momentValue7.format(format || 'YYYY-MM-DD')) || '']);
+    }
+  }, extraProps));
 };
 
 RangePicker$1.defaultProps = {};
@@ -7756,30 +7739,42 @@ var WForm = function WForm(props, ref) {
 
       if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear', 'dateRange', 'dateTimeRange'].includes(c.valueType)) {
         if (c.valueType === 'date' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM-DD');
+          var _c$fieldProps;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps = c.fieldProps) === null || _c$fieldProps === void 0 ? void 0 : _c$fieldProps.format) || 'YYYY-MM-DD');
         }
 
         if (c.valueType === 'dateTime' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM-DD HH:mm:ss');
+          var _c$fieldProps2;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps2 = c.fieldProps) === null || _c$fieldProps2 === void 0 ? void 0 : _c$fieldProps2.format) || 'YYYY-MM-DD HH:mm:ss');
         }
 
         if (c.valueType === 'dateMonth' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM');
+          var _c$fieldProps3;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps3 = c.fieldProps) === null || _c$fieldProps3 === void 0 ? void 0 : _c$fieldProps3.format) || 'YYYY-MM');
         }
 
         if (c.valueType === 'dateYear' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY');
+          var _c$fieldProps4;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps4 = c.fieldProps) === null || _c$fieldProps4 === void 0 ? void 0 : _c$fieldProps4.format) || 'YYYY');
         }
 
         if (c.valueType === 'dateRange' && searchForm[c.dataIndex]) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
-            return item && searchForm[c.dataIndex] && hooks(item).format('YYYY-MM-DD');
+            var _c$fieldProps5;
+
+            return item && searchForm[c.dataIndex] && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps5 = c.fieldProps) === null || _c$fieldProps5 === void 0 ? void 0 : _c$fieldProps5.format) || 'YYYY-MM-DD');
           });
         }
 
         if (c.valueType === 'dateTimeRange' && searchForm[c.dataIndex]) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
-            return item && hooks(item).format('YYYY-MM-DD HH:mm:ss');
+            var _c$fieldProps6;
+
+            return item && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps6 = c.fieldProps) === null || _c$fieldProps6 === void 0 ? void 0 : _c$fieldProps6.format) || 'YYYY-MM-DD HH:mm:ss');
           });
         }
       }

package/dist/index.js

@@ -530,12 +530,7 @@ WInputNumber.defaultProps = {};
 var WDatePicker = function WDatePicker(props) {
   var extraProps = _extends({}, props);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React__default['default'].createElement(_DatePicker__default['default'], _objectSpread2({}, extraProps)) // </ConfigProvider>
-
-  );
+  return /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'], _objectSpread2({}, extraProps));
 };
 
 WDatePicker.defaultProps = {};
@@ -543,12 +538,7 @@ WDatePicker.defaultProps = {};
 var RangePicker = function RangePicker(props) {
   var extraProps = _extends({}, props);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React__default['default'].createElement(_DatePicker__default['default'].RangePicker, _objectSpread2({}, extraProps)) // </ConfigProvider>
-
-  );
+  return /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'].RangePicker, _objectSpread2({}, extraProps));
 };
 
 RangePicker.defaultProps = {};
@@ -683,7 +673,7 @@ function FrameBox(_ref) {
   }), children);
 }
 
-var _excluded$2 = ["request", "valueEnum", "onLoad", "children"],
+var _excluded$2 = ["request", "valueEnum", "onLoad", "children", "params"],
     _excluded2 = ["children"];
 
 var WSelect = function WSelect(props) {
@@ -691,6 +681,7 @@ var WSelect = function WSelect(props) {
       valueEnum = props.valueEnum,
       onLoad = props.onLoad,
       children = props.children,
+      params = props.params,
       extraProps = _objectWithoutProperties(props, _excluded$2);
 
   var _useState = React.useState([]),
@@ -771,7 +762,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), JSON.stringify(request)]);
+  }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -6456,6 +6447,8 @@ var momentValue = function momentValue(value) {
   if (value) {
     return hooks(value);
   }
+
+  return value;
 };
 
 var WDatePicker$1 = function WDatePicker(props) {
@@ -6465,20 +6458,15 @@ var WDatePicker$1 = function WDatePicker(props) {
       _onChange = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded$3);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React__default['default'].createElement(_DatePicker__default['default'], _objectSpread2({
-      defaultValue: momentValue(defaultValue),
-      value: momentValue(value),
-      onChange: function onChange(v) {
-        var _momentValue;
-
-        (_onChange === null || _onChange === void 0 ? void 0 : _onChange(v, (_momentValue = momentValue(v)) === null || _momentValue === void 0 ? void 0 : _momentValue.format(format || 'YYYY-MM-DD'))) || '';
-      }
-    }, extraProps)) // </ConfigProvider>
+  return /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'], _objectSpread2({
+    defaultValue: momentValue(defaultValue),
+    value: momentValue(value),
+    onChange: function onChange(v) {
+      var _momentValue2, _momentValue3;
 
-  );
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange((_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'), (_momentValue3 = momentValue(v)) === null || _momentValue3 === void 0 ? void 0 : _momentValue3.format(format || 'YYYY-MM-DD'));
+    }
+  }, extraProps));
 };
 
 WDatePicker$1.defaultProps = {};
@@ -6490,20 +6478,15 @@ var RangePicker$1 = function RangePicker(props) {
       _onChange2 = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded2$1);
 
-  return (
-    /*#__PURE__*/
-    // <ConfigProvider locale={zhCN}>
-    React__default['default'].createElement(_DatePicker__default['default'].RangePicker, _objectSpread2({
-      defaultValue: momentValue(defaultValue),
-      value: momentValue(value),
-      onChange: function onChange(v) {
-        var _momentValue2;
-
-        (_onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, (_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'))) || '';
-      }
-    }, extraProps)) // </ConfigProvider>
+  return /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'].RangePicker, _objectSpread2({
+    defaultValue: defaultValue ? [momentValue(defaultValue[0]), momentValue(defaultValue[1])] : undefined,
+    value: value ? [momentValue(value[0]), momentValue(value[1])] : undefined,
+    onChange: function onChange(v) {
+      var _momentValue4, _momentValue5, _momentValue6, _momentValue7;
 
-  );
+      _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2([((_momentValue4 = momentValue(v[0])) === null || _momentValue4 === void 0 ? void 0 : _momentValue4.format(format || 'YYYY-MM-DD')) || '', ((_momentValue5 = momentValue(v[1])) === null || _momentValue5 === void 0 ? void 0 : _momentValue5.format(format || 'YYYY-MM-DD')) || ''], [((_momentValue6 = momentValue(v[0])) === null || _momentValue6 === void 0 ? void 0 : _momentValue6.format(format || 'YYYY-MM-DD')) || '', ((_momentValue7 = momentValue(v[1])) === null || _momentValue7 === void 0 ? void 0 : _momentValue7.format(format || 'YYYY-MM-DD')) || '']);
+    }
+  }, extraProps));
 };
 
 RangePicker$1.defaultProps = {};
@@ -7790,30 +7773,42 @@ var WForm = function WForm(props, ref) {
 
       if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear', 'dateRange', 'dateTimeRange'].includes(c.valueType)) {
         if (c.valueType === 'date' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM-DD');
+          var _c$fieldProps;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps = c.fieldProps) === null || _c$fieldProps === void 0 ? void 0 : _c$fieldProps.format) || 'YYYY-MM-DD');
         }
 
         if (c.valueType === 'dateTime' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM-DD HH:mm:ss');
+          var _c$fieldProps2;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps2 = c.fieldProps) === null || _c$fieldProps2 === void 0 ? void 0 : _c$fieldProps2.format) || 'YYYY-MM-DD HH:mm:ss');
         }
 
         if (c.valueType === 'dateMonth' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY-MM');
+          var _c$fieldProps3;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps3 = c.fieldProps) === null || _c$fieldProps3 === void 0 ? void 0 : _c$fieldProps3.format) || 'YYYY-MM');
         }
 
         if (c.valueType === 'dateYear' && searchForm[c.dataIndex]) {
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format('YYYY');
+          var _c$fieldProps4;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps4 = c.fieldProps) === null || _c$fieldProps4 === void 0 ? void 0 : _c$fieldProps4.format) || 'YYYY');
         }
 
         if (c.valueType === 'dateRange' && searchForm[c.dataIndex]) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
-            return item && searchForm[c.dataIndex] && hooks(item).format('YYYY-MM-DD');
+            var _c$fieldProps5;
+
+            return item && searchForm[c.dataIndex] && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps5 = c.fieldProps) === null || _c$fieldProps5 === void 0 ? void 0 : _c$fieldProps5.format) || 'YYYY-MM-DD');
           });
         }
 
         if (c.valueType === 'dateTimeRange' && searchForm[c.dataIndex]) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
-            return item && hooks(item).format('YYYY-MM-DD HH:mm:ss');
+            var _c$fieldProps6;
+
+            return item && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps6 = c.fieldProps) === null || _c$fieldProps6 === void 0 ? void 0 : _c$fieldProps6.format) || 'YYYY-MM-DD HH:mm:ss');
           });
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.3.10",
+  "version": "0.3.13",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -76,4 +76,4 @@
     "react": "^16.12.0",
     "yorkie": "^2.0.0"
   }
-}
+}