venus-design 1.1.21 → 1.1.24

package/dist/VenusForm/staticAttr.js

@@ -46,7 +46,8 @@ export var VENUS_FORM_PLACHOLDER_TYPE = {
   "Rate": "请选择",
   "Slider": "请选择",
   "segmented": "请选择",
-  "money": "请输入"
+  "money": "请输入",
+  "CustomComponent": "请选择"
 };
 
 /**
@@ -141,7 +142,6 @@ export var VENUS_FORM_ITEM_VALUE = {
     } else {
       valueData = dataVal.value;
     }
-    console.log(valueData);
     return _defineProperty({}, formItem.fieldId, valueData);
   },
   "Checkbox": function Checkbox(data, formItem, val) {
@@ -397,7 +397,7 @@ export var handleNameAndIdSplit = function handleNameAndIdSplit(val) {
  */
 export var VENUS_FORM_ITEM_TYPE = {
   "Select": function Select(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormSelect, {
+    return /*#__PURE__*/React.createElement(VenusFormSelect, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
@@ -406,12 +406,12 @@ export var VENUS_FORM_ITEM_TYPE = {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       label: column.fieldName,
       initialValue: column.initialValue,
-      comAttr: _objectSpread({}, column.parameterSource),
       span: column.formWidth,
       style: column.formWidth != null ? null : {
         width: column.formWidth
       },
-      valueEnum: dataToEnum(column.selectSource)
+      valueEnum: dataToEnum(column.selectSource),
+      comAttr: _objectSpread({}, column.parameterSource)
       //@ts-ignore
       ,
       placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
@@ -421,10 +421,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "Input": function Input(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormText, {
+    return /*#__PURE__*/React.createElement(VenusFormText, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -432,9 +432,9 @@ export var VENUS_FORM_ITEM_TYPE = {
       key: column.fieldId,
       label: column.fieldName,
       initialValue: column.initialValue,
+      comAttr: _objectSpread({}, column.parameterSource),
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
-      span: column.formWidth || 8,
-      comAttr: _objectSpread({}, column.parameterSource)
+      span: column.formWidth || 8
       //style={column.formWidth!=null?null:{width:column.formWidth}}
       //@ts-ignore
       ,
@@ -449,10 +449,10 @@ export var VENUS_FORM_ITEM_TYPE = {
           return validatorListToValidator(rule, value, callback, column);
         } : false
       }]
-    });
+    }, column.parameterSource));
   },
   "TimePicker": function TimePicker(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormDatePicker, {
+    return /*#__PURE__*/React.createElement(VenusFormDatePicker, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -460,12 +460,12 @@ export var VENUS_FORM_ITEM_TYPE = {
       key: column.fieldId,
       label: column.fieldName,
       initialValue: column.initialValue,
+      comAttr: _objectSpread({}, column.parameterSource),
       style: column.formWidth != null ? null : {
         width: column.formWidth
       },
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
-      span: column.formWidth || 8,
-      comAttr: _objectSpread({}, column.parameterSource)
+      span: column.formWidth || 8
       //@ts-ignore
       ,
       placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
@@ -475,10 +475,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "DatePicker": function DatePicker(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormDatePicker, {
+    return /*#__PURE__*/React.createElement(VenusFormDatePicker, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -500,10 +500,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "UserPicker": function UserPicker(column, type, disabled, formData, getSecId) {
-    return /*#__PURE__*/React.createElement(FormItem2, {
+    return /*#__PURE__*/React.createElement(FormItem2, _extends({
       width: "md",
       name: handleDataIndex(column.fieldId, column),
       className: column.formItemClassName,
@@ -513,6 +513,7 @@ export var VENUS_FORM_ITEM_TYPE = {
         width: column.formWidth
       },
       label: column.fieldName,
+      comAttr: _objectSpread({}, column.parameterSource),
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       span: column.formWidth || 8 //@ts-ignore
       ,
@@ -525,18 +526,22 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    }, column.parameterSource.oldUser != undefined && column.parameterSource.oldUser ? /*#__PURE__*/React.createElement(SelectUserBySecLevelId, {
+    }, column.parameterSource), column.parameterSource.oldUser != undefined && column.parameterSource.oldUser ? /*#__PURE__*/React.createElement(SelectUserBySecLevelId, {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
+      ,
+      value: column.parameterSource.defaultValue
       //secId={getSecId()}
     }) : /*#__PURE__*/React.createElement(SelectUDRBySecLevelId, {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
+      ,
+      value: column.parameterSource.defaultValue
       //secId={getSecId()}
     }));
   },
   "DeptPicker": function DeptPicker(column, type, disabled, formData, getSecId) {
-    return /*#__PURE__*/React.createElement(FormItem2, {
+    return /*#__PURE__*/React.createElement(FormItem2, _extends({
       width: "md",
       name: handleDataIndex(column.fieldId, column),
       className: column.formItemClassName,
@@ -545,6 +550,7 @@ export var VENUS_FORM_ITEM_TYPE = {
       label: column.fieldName,
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       span: column.formWidth || 8,
+      comAttr: _objectSpread({}, column.parameterSource),
       others: _objectSpread({}, column.parameterSource),
       style: column.formWidth != null ? null : {
         width: column.formWidth
@@ -557,24 +563,26 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    }, column.parameterSource.oldDept != undefined && column.parameterSource.oldDept ? /*#__PURE__*/React.createElement(SelectUserBySecLevelId, {
+    }, column.parameterSource), column.parameterSource.oldDept != undefined && column.parameterSource.oldDept ? /*#__PURE__*/React.createElement(SelectUserBySecLevelId, {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
       ,
       defaultSearchType: "org",
+      value: column.parameterSource.defaultValue,
       secId: -1
     }) : /*#__PURE__*/React.createElement(SelectUDRBySecLevelId, {
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       isMultiple: column.parameterSource.isMultiple != undefined ? column.parameterSource.isMultiple : false //不能多选
       ,
       defaultSearchType: "dept",
+      value: column.parameterSource.defaultValue,
       secId: -1
     }));
   },
   "Radio": function Radio(column, type, disabled, formData) {
     //@ts-ignore
     var radioInputReq = haveQt(column.selectSource);
-    return /*#__PURE__*/React.createElement(VenusFormRadioGroup, {
+    return /*#__PURE__*/React.createElement(VenusFormRadioGroup, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
@@ -607,24 +615,25 @@ export var VENUS_FORM_ITEM_TYPE = {
       }, {
         validator: validateRadioInput
       }]
-    });
+    }, column.parameterSource));
   },
   "Checkbox": function Checkbox(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormCheckBoxGroup, {
+    return /*#__PURE__*/React.createElement(VenusFormCheckBoxGroup, _extends({
       width: "md",
       labelAlign: column.labelAlign || "left",
       name: column.fieldId,
       key: column.fieldId,
       label: column.fieldName,
       className: column.formItemClassName,
+      comAttr: _objectSpread({}, column.parameterSource),
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       span: column.formWidth || 8,
       initialValue: column.initialValue,
       style: column.formWidth != null ? null : {
         width: column.formWidth
       },
-      valueEnum: dataToEnum(column.selectSource),
-      comAttr: _objectSpread({}, column.parameterSource) //@ts-ignore
+      valueEnum: dataToEnum(column.selectSource)
+      //@ts-ignore
       ,
       placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
       rules: [{
@@ -633,10 +642,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "CheckBoxInput": function CheckBoxInput(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormCheckBoxInputGroup, {
+    return /*#__PURE__*/React.createElement(VenusFormCheckBoxInputGroup, _extends({
       width: "md",
       labelAlign: column.labelAlign || "left",
       name: column.fieldId,
@@ -659,10 +668,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "Textarea": function Textarea(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormTextarea, {
+    return /*#__PURE__*/React.createElement(VenusFormTextarea, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
@@ -685,15 +694,18 @@ export var VENUS_FORM_ITEM_TYPE = {
         required: column.parameterSource.required ? getOperatorByLabel(column.parameterSource.required, formData, column) : zeroAndOneToTrueOrFalse(column.formRequiredFlag),
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      }, {
+        validator: column.validatorList != null ? function (rule, value, callback) {
+          return validatorListToValidator(rule, value, callback, column);
+        } : false
       }]
-    });
+    }, column.parameterSource));
   },
   "InputNumber": function InputNumber(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormNumber, {
+    return /*#__PURE__*/React.createElement(VenusFormNumber, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
-      comAttr: _objectSpread({}, column.parameterSource),
       labelAlign: column.labelAlign || "left",
       label: column.fieldName,
       style: column.formWidth != null ? null : {
@@ -702,6 +714,7 @@ export var VENUS_FORM_ITEM_TYPE = {
       className: column.formItemClassName,
       disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
       span: column.formWidth || 8,
+      comAttr: _objectSpread({}, column.parameterSource),
       initialValue: column.initialValue //@ts-ignore
       ,
       placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
@@ -710,12 +723,18 @@ export var VENUS_FORM_ITEM_TYPE = {
         required: column.parameterSource.required ? getOperatorByLabel(column.parameterSource.required, formData, column) : zeroAndOneToTrueOrFalse(column.formRequiredFlag),
         //@ts-ignore 
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      }, {
+        validator: column.validatorList != null ? function (rule, value, callback) {
+          return validatorListToValidator(rule, value, callback, column);
+        } : function (rule, value, callback) {
+          return callback();
+        }
       }]
-    });
+    }, column.parameterSource));
   },
   "SecurityLevel": function SecurityLevel(column, type, disabled, formData, getSecId) {
     try {
-      return /*#__PURE__*/React.createElement(FormItem2, {
+      return /*#__PURE__*/React.createElement(FormItem2, _extends({
         width: "md",
         labelAlign: column.labelAlign || "left",
         name: column.fieldId,
@@ -724,6 +743,7 @@ export var VENUS_FORM_ITEM_TYPE = {
         label: column.fieldName,
         disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene),
         span: column.formWidth || 8,
+        comAttr: _objectSpread({}, column.parameterSource),
         others: _objectSpread({}, column.parameterSource),
         style: column.formWidth != null ? null : {
           width: column.formWidth
@@ -737,9 +757,9 @@ export var VENUS_FORM_ITEM_TYPE = {
           //@ts-ignore
           message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
         }]
-      }, /*#__PURE__*/React.createElement(SelectKYSeclevel, {
+      }, column.parameterSource), /*#__PURE__*/React.createElement(SelectKYSeclevel, _extends({}, column.parameterSource, {
         disabled: disabled ? disabled : isNotEditScene(type, column.nonEditableScene)
-      }));
+      })));
     } catch (err) {
       console.log(err);
     }
@@ -785,7 +805,7 @@ export var VENUS_FORM_ITEM_TYPE = {
     }
   },
   "numberUnit": function numberUnit(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormNumberUnit, {
+    return /*#__PURE__*/React.createElement(VenusFormNumberUnit, _extends({
       width: "md",
       className: column.formItemClassName,
       name: column.fieldId,
@@ -808,12 +828,16 @@ export var VENUS_FORM_ITEM_TYPE = {
         required: column.parameterSource.required ? getOperatorByLabel(column.parameterSource.required, formData, column) : zeroAndOneToTrueOrFalse(column.formRequiredFlag),
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      }, {
+        validator: column.validatorList != null ? function (rule, value, callback) {
+          return validatorListToValidator(rule, value, callback, column);
+        } : false
       }]
-    });
+    }, column.parameterSource));
   },
   //百分比
   "numberPercent": function numberPercent(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormNumberPercent, {
+    return /*#__PURE__*/React.createElement(VenusFormNumberPercent, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
@@ -836,13 +860,17 @@ export var VENUS_FORM_ITEM_TYPE = {
         required: column.parameterSource.required ? getOperatorByLabel(column.parameterSource.required, formData, column) : zeroAndOneToTrueOrFalse(column.formRequiredFlag),
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      }, {
+        validator: column.validatorList != null ? function (rule, value, callback) {
+          return validatorListToValidator(rule, value, callback, column);
+        } : false
       }]
-    });
+    }, column.parameterSource));
   },
   //带后缀的文本输入框（暂不实现）
   "textUnit": function textUnit() {},
-  "uploadSecLevel": function uploadSecLevel(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormUploadSecLevel, {
+  "uploadSecLevel": function uploadSecLevel(column, type, disabled, formData, getSecId) {
+    return /*#__PURE__*/React.createElement(VenusFormUploadSecLevel, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -860,8 +888,8 @@ export var VENUS_FORM_ITEM_TYPE = {
       //附件密级根据某个字段变化时配置uploadSecField：“字段名”
       //@ts-ignore
       ,
-      comAttr: column.parameterSource.uploadSecField && {
-        secId: formData[column.parameterSource.uploadSecField] && formData[column.parameterSource.uploadSecField].value
+      comAttr: {
+        secId: getSecId()
       },
       rules: [{
         //是否必填通过其他字段判断时可使用required：{label:string,fieldName:string,value:any}
@@ -869,10 +897,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "upload": function upload(column, type, disabled, formData) {
-    return column.parameterSource.haveSec ? /*#__PURE__*/React.createElement(VenusFormUploadPro, {
+    return column.parameterSource.haveSec ? /*#__PURE__*/React.createElement(VenusFormUploadPro, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -899,7 +927,7 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    }) : /*#__PURE__*/React.createElement(VenusFormUpload, {
+    }, column.parameterSource)) : /*#__PURE__*/React.createElement(VenusFormUpload, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -921,10 +949,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "uploadImage": function uploadImage(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormUploadImage, {
+    return /*#__PURE__*/React.createElement(VenusFormUploadImage, _extends({
       width: "md",
       className: column.formItemClassName,
       labelAlign: column.labelAlign || "left",
@@ -947,10 +975,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "treeSelect": function treeSelect(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormTreeSelect, {
+    return /*#__PURE__*/React.createElement(VenusFormTreeSelect, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId,
@@ -980,10 +1008,10 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "search": function search(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormSearch, {
+    return /*#__PURE__*/React.createElement(VenusFormSearch, _extends({
       width: "md",
       name: column.fieldId,
       key: column.fieldId
@@ -1008,7 +1036,7 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "captcha": function captcha() {},
   //验证码
@@ -1019,7 +1047,7 @@ export var VENUS_FORM_ITEM_TYPE = {
   "digitRange": function digitRange() {},
   //数字范围
   "switch": function _switch(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormSwitch, {
+    return /*#__PURE__*/React.createElement(VenusFormSwitch, _extends({
       labelAlign: column.labelAlign || "left",
       width: "md",
       name: column.fieldId,
@@ -1030,11 +1058,11 @@ export var VENUS_FORM_ITEM_TYPE = {
       span: column.formWidth || 8
       //style={column.formWidth!=null?null:{width:column.formWidth}}
       ,
-      comAttr: {
+      comAttr: _objectSpread({
         checkedChildren: column.checkedText,
         unCheckedChildren: column.uncheckedText,
         defaultChecked: zeroAndOneToTrueOrFalse(column.defaultChecked)
-      }
+      }, column.parameterSource)
       //@ts-ignore
       ,
       placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
@@ -1044,11 +1072,11 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   //评分
   "Rate": function Rate(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormRate, {
+    return /*#__PURE__*/React.createElement(VenusFormRate, _extends({
       labelAlign: column.labelAlign || "left",
       width: "md",
       name: column.fieldId,
@@ -1067,11 +1095,11 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   //滑块输入条
   "Slider": function Slider(column, type, disabled, formData) {
-    return /*#__PURE__*/React.createElement(VenusFormSlider, {
+    return /*#__PURE__*/React.createElement(VenusFormSlider, _extends({
       labelAlign: column.labelAlign || "left",
       width: "md",
       name: column.fieldId,
@@ -1090,7 +1118,7 @@ export var VENUS_FORM_ITEM_TYPE = {
         //@ts-ignore
         message: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
       }]
-    });
+    }, column.parameterSource));
   },
   "segmented": function segmented() {},
   //分段控制器

package/dist/VenusTable/components/filterDrawer/index.js

@@ -19,13 +19,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useImperativeHandle } from "react";
 import { ProForm } from "../../..";
 import { handleSearchFormItems } from "./handleVenusSearchForm";
+import moment from "moment";
 import dayjs from "dayjs";
 var setSearchForm = function setSearchForm(val, columns) {
   if (columns.length > 0) {
     columns.forEach(function (ls) {
       if (ls.gridFilterType == "date" && val[ls.fieldId] && val[ls.fieldId].length > 0) {
-        console.log(val[ls.fieldId]);
-        val[ls.fieldId] = [new Date(val[ls.fieldId][0]).getTime(), new Date(val[ls.fieldId][1]).getTime()];
+        val[ls.fieldId] = [moment(new Date(val[ls.fieldId][0])).format("YYYY-MM-DD"), moment(new Date(val[ls.fieldId][1])).format("YYYY-MM-DD")];
+      } else if (!val[ls.fieldId]) {
+        val[ls.fieldId] = undefined;
       }
     });
   }
@@ -56,7 +58,8 @@ var FilterDrawer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return {
       /* 1. 对指定数组内的字段统一设置禁用/启用 */
       resetFields: function resetFields() {
-        return form.resetFields();
+        form.resetFields();
+        props.onSearchFinish(setSearchForm({}, props.columns));
       }
     };
   });

package/dist/VenusTable/components/filterDrawer/staticAttr.js

@@ -8,6 +8,7 @@ import { dataToEnum, handleDataIndex, VenusFormSelect, VenusFormText } from "../
 import React from "react";
 import { VENUS_FORM_PLACHOLDER_TYPE } from "../../../VenusForm/staticAttr";
 import { VenusFormDateRangePicker, VenusFormNumberRange } from "../../../ProForm";
+
 /**
  * 表单项的类型
  */
@@ -29,7 +30,7 @@ export var VENUS_SEARCH_FORM_ITEM_TYPE = {
       valueEnum: dataToEnum(column.selectSource)
       //@ts-ignore
       ,
-      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType || "Select"] + column.fieldName
     });
   },
   "text": function text(column) {
@@ -45,7 +46,7 @@ export var VENUS_SEARCH_FORM_ITEM_TYPE = {
       comAttr: _objectSpread({}, column.parameterSource)
       //@ts-ignore
       ,
-      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType || "Input"] + column.fieldName
     });
   },
   "date": function date(column) {
@@ -64,7 +65,7 @@ export var VENUS_SEARCH_FORM_ITEM_TYPE = {
       comAttr: _objectSpread({}, column.parameterSource)
       //@ts-ignore
       ,
-      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName
+      placeholder: ["请选择开始时间", "请选择结束时间"]
     });
   },
   "number": function number(column) {
@@ -83,7 +84,7 @@ export var VENUS_SEARCH_FORM_ITEM_TYPE = {
       comAttr: _objectSpread({}, column.parameterSource)
       //@ts-ignore
       ,
-      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType] + column.fieldName,
+      placeholder: VENUS_FORM_PLACHOLDER_TYPE[column.formUnitType || "Input"] + column.fieldName,
       min: 0,
       max: 999999,
       fieldProps: {