wargerm 0.2.15 → 0.2.19

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import { DatePickerProps, RangePickerProps } from 'antd/lib/date-picker';
+export declare type IndexComponent = React.FC<DatePickerProps> & {
+    RangePicker: React.FC<RangePickerProps>;
+};
+declare const Index: IndexComponent;
+export default Index;

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { default as Checkbox } from './components/Checkbox';
 export { default as Radio } from './components/Radio';
 export { default as Select } from './components/Select';
 export { default as DatePicker } from './components/DatePicker';
+export { default as WDatePicker } from './components/WDatePicker';
 export { default as Switch } from './components/Switch';
 export { default as TreeSelect } from './components/TreeSelect';
 export { default as WForm } from './components/WForm';

package/dist/index.esm.js

@@ -523,6 +523,11 @@ var WSelect = function WSelect(props) {
       valueEnumList = _useState4[0],
       setValueEnumList = _useState4[1];
 
+  var _useState5 = useState(null),
+      _useState6 = _slicedToArray(_useState5, 2),
+      resList = _useState6[0],
+      setResList = _useState6[1];
+
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
@@ -531,7 +536,7 @@ var WSelect = function WSelect(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
 
@@ -540,6 +545,7 @@ var WSelect = function WSelect(props) {
 
             case 3:
               res = _context.sent;
+              setResList(res);
               onLoad && onLoad(res);
               node = res.map(function (item) {
                 return /*#__PURE__*/React.createElement(_Select.Option, {
@@ -549,7 +555,7 @@ var WSelect = function WSelect(props) {
               });
               setChildrenNode(node);
 
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -585,7 +591,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, []);
+  }, [JSON.stringify(resList)]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7532,8 +7538,65 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
-var RangePicker$2 = Index$2.RangePicker;
+var _excluded$5 = ["defaultValue", "format", "value", "onChange"],
+    _excluded2$1 = ["defaultValue", "value", "format", "onChange"];
+
+var momentValue = function momentValue(value) {
+  if (value) {
+    return hooks(value);
+  }
+};
+
+var WDatePicker$1 = function WDatePicker(props) {
+  var defaultValue = props.defaultValue,
+      format = props.format,
+      value = props.value,
+      _onChange = props.onChange,
+      extraProps = _objectWithoutProperties(props, _excluded$5);
+
+  return (
+    /*#__PURE__*/
+    // <ConfigProvider locale={zhCN}>
+    React.createElement(_DatePicker, _objectSpread2({
+      defaultValue: momentValue(defaultValue),
+      value: momentValue(value),
+      onChange: function onChange(v) {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+      }
+    }, extraProps)) // </ConfigProvider>
+
+  );
+};
+
+WDatePicker$1.defaultProps = {};
+
+var RangePicker$2 = function RangePicker(props) {
+  var defaultValue = props.defaultValue,
+      value = props.value,
+      format = props.format,
+      _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) {
+        _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+      }
+    }, extraProps)) // </ConfigProvider>
+
+  );
+};
+
+RangePicker$2.defaultProps = {};
+var Index$6 = WDatePicker$1;
+Index$6.RangePicker = RangePicker$2;
+
+var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
+var RangePicker$3 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -7546,7 +7609,7 @@ var WForm = function WForm(props, ref) {
       onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
-      extraProps = _objectWithoutProperties(props, _excluded$5);
+      extraProps = _objectWithoutProperties(props, _excluded$6);
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -7710,7 +7773,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React.createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -7746,7 +7809,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol3
-        }), /*#__PURE__*/React.createElement(RangePicker$2, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(RangePicker$3, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, _showTime), c.fieldProps))));
       } else if (c.valueType === 'checkbox') {
@@ -8173,7 +8236,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol13
-        }), /*#__PURE__*/React.createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -8209,7 +8272,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol14
-        }), /*#__PURE__*/React.createElement(RangePicker$2, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(RangePicker$3, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, _showTime2), c.fieldProps))));
       } else if (c.valueType === 'checkbox') {
@@ -8636,8 +8699,8 @@ var WForm = function WForm(props, ref) {
 
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
 
-var _excluded$6 = ["height", "width", "count", "style", "numberStyle"],
-    _excluded2$1 = ["count", "width", "height", "marginRight"];
+var _excluded$7 = ["height", "width", "count", "style", "numberStyle"],
+    _excluded2$2 = ["count", "width", "height", "marginRight"];
 
 var Number = function Number(_ref) {
   var height = _ref.height,
@@ -8646,7 +8709,7 @@ var Number = function Number(_ref) {
       count = _ref$count === void 0 ? 0 : _ref$count,
       style = _ref.style,
       numberStyle = _ref.numberStyle,
-      props = _objectWithoutProperties(_ref, _excluded$6);
+      props = _objectWithoutProperties(_ref, _excluded$7);
 
   // 上次的值
   var _useState = useState(0),
@@ -8766,13 +8829,13 @@ Number.defaultProps = {
   height: 40
 };
 
-var Index$6 = function Index(props) {
+var Index$7 = function Index(props) {
   var count = props.count,
       width = props.width,
       height = props.height,
       _props$marginRight = props.marginRight,
       marginRight = _props$marginRight === void 0 ? '8px' : _props$marginRight,
-      extraProps = _objectWithoutProperties(props, _excluded2$1);
+      extraProps = _objectWithoutProperties(props, _excluded2$2);
 
   var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
@@ -8803,26 +8866,26 @@ var Index$6 = function Index(props) {
   }));
 };
 
-var _excluded$7 = ["duration"];
+var _excluded$8 = ["duration"];
 
-var Index$7 = function Index(props) {
+var Index$8 = function Index(props) {
   var _props$duration = props.duration,
       duration = _props$duration === void 0 ? 2.75 : _props$duration,
-      extraProps = _objectWithoutProperties(props, _excluded$7);
+      extraProps = _objectWithoutProperties(props, _excluded$8);
   return /*#__PURE__*/React.createElement(CountUp, _objectSpread2({
     duration: duration
   }, extraProps));
 };
 
-Index$7.defaultProps = {};
+Index$8.defaultProps = {};
 
-var _excluded$8 = ["list", "render", "partSize"];
-var autoScrollInterval = null;
+var _excluded$9 = ["list", "render", "partSize"];
 
 function AutoScroll(props) {
   var inner1 = useRef();
   var inner2 = useRef();
   var outer = useRef();
+  var timer = useRef(null);
   useImperativeHandle(props.cref, function () {
     return {
       tryScroll: tryScroll
@@ -8843,8 +8906,8 @@ function AutoScroll(props) {
 
 
   var startScroll = function startScroll() {
-    if (!autoScrollInterval) {
-      autoScrollInterval = setInterval(function () {
+    if (!timer.current) {
+      timer.current = setInterval(function () {
         // 如果已经滚动到inner1的底部，则重置滚动的位置到inner1的头部
         if (outer.current.scrollTop >= inner1.current.offsetHeight) {
           outer.current.scrollTop = 0; // 触发complete事件
@@ -8864,8 +8927,11 @@ function AutoScroll(props) {
 
 
   var stopScroll = function stopScroll() {
-    clearInterval(autoScrollInterval);
-    autoScrollInterval = null;
+    if (timer.current) {
+      clearInterval(timer.current);
+    }
+
+    timer.current = null;
   };
 
   useEffect(function () {
@@ -8876,7 +8942,7 @@ function AutoScroll(props) {
     return function () {
       stopScroll();
     };
-  }, []);
+  }, [timer]);
   return /*#__PURE__*/React.createElement("div", {
     className: "autoScroll-outer ".concat(props.className),
     ref: outer,
@@ -8892,12 +8958,12 @@ function AutoScroll(props) {
   }));
 }
 
-var Index$8 = function Index(_ref) {
+var Index$9 = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
       _ref$partSize = _ref.partSize,
       partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
-      otherProps = _objectWithoutProperties(_ref, _excluded$8);
+      otherProps = _objectWithoutProperties(_ref, _excluded$9);
 
   {
     var _useState = useState([]),
@@ -8974,15 +9040,15 @@ var Index$8 = function Index(_ref) {
   }
 };
 
-var _excluded$9 = ["data", "onClick", "renderItem"];
+var _excluded$a = ["data", "onClick", "renderItem"];
 
 SwiperCore.use([Pagination, Navigation, Autoplay]);
 
-var Index$9 = function Index(props) {
+var Index$a = function Index(props) {
   var data = props.data,
       _onClick = props.onClick,
       renderItem = props.renderItem,
-      extraProps = _objectWithoutProperties(props, _excluded$9);
+      extraProps = _objectWithoutProperties(props, _excluded$a);
 
   return /*#__PURE__*/React.createElement(Swiper, _objectSpread2({
     onClick: function onClick(swiper, event) {
@@ -9011,7 +9077,7 @@ var Index$9 = function Index(props) {
   }));
 };
 
-Index$9.defaultProps = {};
+Index$a.defaultProps = {};
 
 function _extends$1() {
   _extends$1 = Object.assign || function (target) {
@@ -9605,7 +9671,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$a = ["routes", "className"];
+var _excluded$b = ["routes", "className"];
 var history = createBrowserHistory();
 
 function itemRender(route, params, routes, paths) {
@@ -9620,10 +9686,10 @@ function itemRender(route, params, routes, paths) {
   }, route.breadcrumbName);
 }
 
-var Index$a = function Index(_ref) {
+var Index$b = function Index(_ref) {
   var routes = _ref.routes,
       className = _ref.className,
-      props = _objectWithoutProperties(_ref, _excluded$a);
+      props = _objectWithoutProperties(_ref, _excluded$b);
 
   return /*#__PURE__*/React.createElement(_Breadcrumb, _objectSpread2({
     className: className || 'default',
@@ -9633,9 +9699,9 @@ var Index$a = function Index(_ref) {
   }, props));
 };
 
-var _excluded$b = ["title", "className", "headerTail", "headerCenter"];
+var _excluded$c = ["title", "className", "headerTail", "headerCenter"];
 
-var Index$b = function Index(_ref) {
+var Index$c = function Index(_ref) {
   var _classNames;
 
   var title = _ref.title,
@@ -9643,7 +9709,7 @@ var Index$b = function Index(_ref) {
       className = _ref$className === void 0 ? 'default' : _ref$className,
       headerTail = _ref.headerTail,
       headerCenter = _ref.headerCenter,
-      props = _objectWithoutProperties(_ref, _excluded$b);
+      props = _objectWithoutProperties(_ref, _excluded$c);
 
   return /*#__PURE__*/React.createElement("div", _objectSpread2({
     className: classnames((_classNames = {}, _defineProperty(_classNames, 'card-container', true), _defineProperty(_classNames, className, true), _classNames))
@@ -9662,7 +9728,7 @@ var Index$b = function Index(_ref) {
   }, props.children))));
 };
 
-Index$b.defaultProps = {};
+Index$c.defaultProps = {};
 
 var controlShow = function controlShow(f1, f2, value, timer) {
   f1(value);
@@ -9750,7 +9816,7 @@ function DialogModel(props) {
   return renderChildren;
 }
 
-var _excluded$c = ["visible"];
+var _excluded$d = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9882,7 +9948,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$c);
+        trueProps = _objectWithoutProperties(props, _excluded$d);
 
     useEffect(function () {
       manager.mounted = true;
@@ -9906,7 +9972,7 @@ Modal.hidden = function () {
   ModalContainer[modelSysbol] && ModalContainer[modelSysbol].hidden();
 };
 
-var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
+var _excluded$e = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -9920,7 +9986,7 @@ var ModalForm = function ModalForm(props, ref) {
       title = props.title,
       record = props.record,
       onFormChange = props.onFormChange,
-      extraProps = _objectWithoutProperties(props, _excluded$d);
+      extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var formRef = useRef(null);
 
@@ -10051,7 +10117,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
+var _excluded$f = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10065,7 +10131,7 @@ var TabelCard = function TabelCard(props, ref) {
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
       optionColumnConfig = props.optionColumnConfig,
-      extraProps = _objectWithoutProperties(props, _excluded$e);
+      extraProps = _objectWithoutProperties(props, _excluded$f);
 
   var actionRef = useRef();
   var formRef = useRef(null);
@@ -10355,7 +10421,19 @@ var TabelCard = function TabelCard(props, ref) {
     onFormChange: onFormChange,
     extraColumns: extraColumns || [],
     columns: (columns || []).filter(function (item) {
-      return !item.hiddenInModalForm;
+      if (item.hiddenInModalForm) {
+        return false;
+      }
+
+      if (item.onlyShowInView) {
+        if (modalFormConfig.type === '查看') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      return true;
     })
   })), /*#__PURE__*/React.createElement(ProTable, _objectSpread2({
     actionRef: actionRef,
@@ -10372,7 +10450,23 @@ var TabelCard = function TabelCard(props, ref) {
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }, optionColumnConfig)]) : columns || [],
+    }, optionColumnConfig)]).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }) : (columns || []).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }),
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {
@@ -10387,4 +10481,4 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React.forwardRef(TabelCard);
 
-export { Index$8 as AutoScroll, Index$a as Breadcrumb, WButton as Button, Index$b as Card, Index$4 as Checkbox, Index$7 as CountUp, Index$2 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Index$6 as Number, NumericInput, Index$3 as Radio, Index$1 as Select, Index$9 as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$5 as TreeSelect, WForm$1 as WForm };
+export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, Index$c as Card, Index$4 as Checkbox, Index$8 as CountUp, Index$2 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Index$7 as Number, NumericInput, Index$3 as Radio, Index$1 as Select, Index$a as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$5 as TreeSelect, Index$6 as WDatePicker, WForm$1 as WForm };

package/dist/index.js

@@ -556,6 +556,11 @@ var WSelect = function WSelect(props) {
       valueEnumList = _useState4[0],
       setValueEnumList = _useState4[1];
 
+  var _useState5 = React.useState(null),
+      _useState6 = _slicedToArray(_useState5, 2),
+      resList = _useState6[0],
+      setResList = _useState6[1];
+
   React.useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
@@ -564,7 +569,7 @@ var WSelect = function WSelect(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
 
@@ -573,6 +578,7 @@ var WSelect = function WSelect(props) {
 
             case 3:
               res = _context.sent;
+              setResList(res);
               onLoad && onLoad(res);
               node = res.map(function (item) {
                 return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
@@ -582,7 +588,7 @@ var WSelect = function WSelect(props) {
               });
               setChildrenNode(node);
 
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -618,7 +624,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, []);
+  }, [JSON.stringify(resList)]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7565,8 +7571,65 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
-var RangePicker$2 = Index$2.RangePicker;
+var _excluded$5 = ["defaultValue", "format", "value", "onChange"],
+    _excluded2$1 = ["defaultValue", "value", "format", "onChange"];
+
+var momentValue = function momentValue(value) {
+  if (value) {
+    return hooks(value);
+  }
+};
+
+var WDatePicker$1 = function WDatePicker(props) {
+  var defaultValue = props.defaultValue,
+      format = props.format,
+      value = props.value,
+      _onChange = props.onChange,
+      extraProps = _objectWithoutProperties(props, _excluded$5);
+
+  return (
+    /*#__PURE__*/
+    // <ConfigProvider locale={zhCN}>
+    React__default['default'].createElement(_DatePicker__default['default'], _objectSpread2({
+      defaultValue: momentValue(defaultValue),
+      value: momentValue(value),
+      onChange: function onChange(v) {
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+      }
+    }, extraProps)) // </ConfigProvider>
+
+  );
+};
+
+WDatePicker$1.defaultProps = {};
+
+var RangePicker$2 = function RangePicker(props) {
+  var defaultValue = props.defaultValue,
+      value = props.value,
+      format = props.format,
+      _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) {
+        _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+      }
+    }, extraProps)) // </ConfigProvider>
+
+  );
+};
+
+RangePicker$2.defaultProps = {};
+var Index$6 = WDatePicker$1;
+Index$6.RangePicker = RangePicker$2;
+
+var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
+var RangePicker$3 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -7579,7 +7642,7 @@ var WForm = function WForm(props, ref) {
       onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
-      extraProps = _objectWithoutProperties(props, _excluded$5);
+      extraProps = _objectWithoutProperties(props, _excluded$6);
 
   var _Form$useForm = _Form__default['default'].useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -7743,7 +7806,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol2
-        }), /*#__PURE__*/React__default['default'].createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -7779,7 +7842,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol3
-        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$2, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$3, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, _showTime), c.fieldProps))));
       } else if (c.valueType === 'checkbox') {
@@ -8206,7 +8269,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol13
-        }), /*#__PURE__*/React__default['default'].createElement(Index$2, _objectSpread2(_objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
           disabled: disabled,
           placeholder: "\u8BF7\u8F93\u5165"
         }, picker), showTime), c.fieldProps))));
@@ -8242,7 +8305,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: _labelCol14
-        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$2, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(RangePicker$3, _objectSpread2(_objectSpread2({
           disabled: disabled
         }, _showTime2), c.fieldProps))));
       } else if (c.valueType === 'checkbox') {
@@ -8669,8 +8732,8 @@ var WForm = function WForm(props, ref) {
 
 var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
 
-var _excluded$6 = ["height", "width", "count", "style", "numberStyle"],
-    _excluded2$1 = ["count", "width", "height", "marginRight"];
+var _excluded$7 = ["height", "width", "count", "style", "numberStyle"],
+    _excluded2$2 = ["count", "width", "height", "marginRight"];
 
 var Number = function Number(_ref) {
   var height = _ref.height,
@@ -8679,7 +8742,7 @@ var Number = function Number(_ref) {
       count = _ref$count === void 0 ? 0 : _ref$count,
       style = _ref.style,
       numberStyle = _ref.numberStyle,
-      props = _objectWithoutProperties(_ref, _excluded$6);
+      props = _objectWithoutProperties(_ref, _excluded$7);
 
   // 上次的值
   var _useState = React.useState(0),
@@ -8799,13 +8862,13 @@ Number.defaultProps = {
   height: 40
 };
 
-var Index$6 = function Index(props) {
+var Index$7 = function Index(props) {
   var count = props.count,
       width = props.width,
       height = props.height,
       _props$marginRight = props.marginRight,
       marginRight = _props$marginRight === void 0 ? '8px' : _props$marginRight,
-      extraProps = _objectWithoutProperties(props, _excluded2$1);
+      extraProps = _objectWithoutProperties(props, _excluded2$2);
 
   var _useState9 = React.useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
@@ -8836,26 +8899,26 @@ var Index$6 = function Index(props) {
   }));
 };
 
-var _excluded$7 = ["duration"];
+var _excluded$8 = ["duration"];
 
-var Index$7 = function Index(props) {
+var Index$8 = function Index(props) {
   var _props$duration = props.duration,
       duration = _props$duration === void 0 ? 2.75 : _props$duration,
-      extraProps = _objectWithoutProperties(props, _excluded$7);
+      extraProps = _objectWithoutProperties(props, _excluded$8);
   return /*#__PURE__*/React__default['default'].createElement(CountUp__default['default'], _objectSpread2({
     duration: duration
   }, extraProps));
 };
 
-Index$7.defaultProps = {};
+Index$8.defaultProps = {};
 
-var _excluded$8 = ["list", "render", "partSize"];
-var autoScrollInterval = null;
+var _excluded$9 = ["list", "render", "partSize"];
 
 function AutoScroll(props) {
   var inner1 = React.useRef();
   var inner2 = React.useRef();
   var outer = React.useRef();
+  var timer = React.useRef(null);
   React.useImperativeHandle(props.cref, function () {
     return {
       tryScroll: tryScroll
@@ -8876,8 +8939,8 @@ function AutoScroll(props) {
 
 
   var startScroll = function startScroll() {
-    if (!autoScrollInterval) {
-      autoScrollInterval = setInterval(function () {
+    if (!timer.current) {
+      timer.current = setInterval(function () {
         // 如果已经滚动到inner1的底部，则重置滚动的位置到inner1的头部
         if (outer.current.scrollTop >= inner1.current.offsetHeight) {
           outer.current.scrollTop = 0; // 触发complete事件
@@ -8897,8 +8960,11 @@ function AutoScroll(props) {
 
 
   var stopScroll = function stopScroll() {
-    clearInterval(autoScrollInterval);
-    autoScrollInterval = null;
+    if (timer.current) {
+      clearInterval(timer.current);
+    }
+
+    timer.current = null;
   };
 
   React.useEffect(function () {
@@ -8909,7 +8975,7 @@ function AutoScroll(props) {
     return function () {
       stopScroll();
     };
-  }, []);
+  }, [timer]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "autoScroll-outer ".concat(props.className),
     ref: outer,
@@ -8925,12 +8991,12 @@ function AutoScroll(props) {
   }));
 }
 
-var Index$8 = function Index(_ref) {
+var Index$9 = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
       _ref$partSize = _ref.partSize,
       partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
-      otherProps = _objectWithoutProperties(_ref, _excluded$8);
+      otherProps = _objectWithoutProperties(_ref, _excluded$9);
 
   {
     var _useState = React.useState([]),
@@ -9007,15 +9073,15 @@ var Index$8 = function Index(_ref) {
   }
 };
 
-var _excluded$9 = ["data", "onClick", "renderItem"];
+var _excluded$a = ["data", "onClick", "renderItem"];
 
 SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation, SwiperCore.Autoplay]);
 
-var Index$9 = function Index(props) {
+var Index$a = function Index(props) {
   var data = props.data,
       _onClick = props.onClick,
       renderItem = props.renderItem,
-      extraProps = _objectWithoutProperties(props, _excluded$9);
+      extraProps = _objectWithoutProperties(props, _excluded$a);
 
   return /*#__PURE__*/React__default['default'].createElement(react.Swiper, _objectSpread2({
     onClick: function onClick(swiper, event) {
@@ -9044,7 +9110,7 @@ var Index$9 = function Index(props) {
   }));
 };
 
-Index$9.defaultProps = {};
+Index$a.defaultProps = {};
 
 function _extends$1() {
   _extends$1 = Object.assign || function (target) {
@@ -9638,7 +9704,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$a = ["routes", "className"];
+var _excluded$b = ["routes", "className"];
 var history = createBrowserHistory();
 
 function itemRender(route, params, routes, paths) {
@@ -9653,10 +9719,10 @@ function itemRender(route, params, routes, paths) {
   }, route.breadcrumbName);
 }
 
-var Index$a = function Index(_ref) {
+var Index$b = function Index(_ref) {
   var routes = _ref.routes,
       className = _ref.className,
-      props = _objectWithoutProperties(_ref, _excluded$a);
+      props = _objectWithoutProperties(_ref, _excluded$b);
 
   return /*#__PURE__*/React__default['default'].createElement(_Breadcrumb__default['default'], _objectSpread2({
     className: className || 'default',
@@ -9666,9 +9732,9 @@ var Index$a = function Index(_ref) {
   }, props));
 };
 
-var _excluded$b = ["title", "className", "headerTail", "headerCenter"];
+var _excluded$c = ["title", "className", "headerTail", "headerCenter"];
 
-var Index$b = function Index(_ref) {
+var Index$c = function Index(_ref) {
   var _classNames;
 
   var title = _ref.title,
@@ -9676,7 +9742,7 @@ var Index$b = function Index(_ref) {
       className = _ref$className === void 0 ? 'default' : _ref$className,
       headerTail = _ref.headerTail,
       headerCenter = _ref.headerCenter,
-      props = _objectWithoutProperties(_ref, _excluded$b);
+      props = _objectWithoutProperties(_ref, _excluded$c);
 
   return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread2({
     className: classnames__default['default']((_classNames = {}, _defineProperty(_classNames, 'card-container', true), _defineProperty(_classNames, className, true), _classNames))
@@ -9695,7 +9761,7 @@ var Index$b = function Index(_ref) {
   }, props.children))));
 };
 
-Index$b.defaultProps = {};
+Index$c.defaultProps = {};
 
 var controlShow = function controlShow(f1, f2, value, timer) {
   f1(value);
@@ -9783,7 +9849,7 @@ function DialogModel(props) {
   return renderChildren;
 }
 
-var _excluded$c = ["visible"];
+var _excluded$d = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9915,7 +9981,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$c);
+        trueProps = _objectWithoutProperties(props, _excluded$d);
 
     React.useEffect(function () {
       manager.mounted = true;
@@ -9939,7 +10005,7 @@ Modal.hidden = function () {
   ModalContainer[modelSysbol] && ModalContainer[modelSysbol].hidden();
 };
 
-var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
+var _excluded$e = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -9953,7 +10019,7 @@ var ModalForm = function ModalForm(props, ref) {
       title = props.title,
       record = props.record,
       onFormChange = props.onFormChange,
-      extraProps = _objectWithoutProperties(props, _excluded$d);
+      extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var formRef = React.useRef(null);
 
@@ -10084,7 +10150,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
+var _excluded$f = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10098,7 +10164,7 @@ var TabelCard = function TabelCard(props, ref) {
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
       optionColumnConfig = props.optionColumnConfig,
-      extraProps = _objectWithoutProperties(props, _excluded$e);
+      extraProps = _objectWithoutProperties(props, _excluded$f);
 
   var actionRef = React.useRef();
   var formRef = React.useRef(null);
@@ -10388,7 +10454,19 @@ var TabelCard = function TabelCard(props, ref) {
     onFormChange: onFormChange,
     extraColumns: extraColumns || [],
     columns: (columns || []).filter(function (item) {
-      return !item.hiddenInModalForm;
+      if (item.hiddenInModalForm) {
+        return false;
+      }
+
+      if (item.onlyShowInView) {
+        if (modalFormConfig.type === '查看') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      return true;
     })
   })), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2({
     actionRef: actionRef,
@@ -10405,7 +10483,23 @@ var TabelCard = function TabelCard(props, ref) {
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }, optionColumnConfig)]) : columns || [],
+    }, optionColumnConfig)]).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }) : (columns || []).map(function (item) {
+      var obj = _objectSpread2({}, item);
+
+      if (item.notInitialValueInSearch) {
+        delete obj.initialValue;
+      }
+
+      return obj;
+    }),
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {
@@ -10420,25 +10514,26 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React__default['default'].forwardRef(TabelCard);
 
-exports.AutoScroll = Index$8;
-exports.Breadcrumb = Index$a;
+exports.AutoScroll = Index$9;
+exports.Breadcrumb = Index$b;
 exports.Button = WButton;
-exports.Card = Index$b;
+exports.Card = Index$c;
 exports.Checkbox = Index$4;
-exports.CountUp = Index$7;
+exports.CountUp = Index$8;
 exports.DatePicker = Index$2;
 exports.IconFont = index;
 exports.Input = Index;
 exports.InputNumber = WInputNumber;
 exports.Modal = Modal;
 exports.ModalForm = ModalForm$1;
-exports.Number = Index$6;
+exports.Number = Index$7;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$3;
 exports.Select = Index$1;
-exports.Swiper = Index$9;
+exports.Swiper = Index$a;
 exports.Switch = WSwitch;
 exports.TabelCard = index$1;
 exports.Table = Table;
 exports.TreeSelect = Index$5;
+exports.WDatePicker = Index$6;
 exports.WForm = WForm$1;

package/package.json

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