@zat-design/sisyphus-react 3.0.13 → 3.0.16-beta.2

package/lib/ProEditLabel/propsType.d.ts

@@ -1,6 +1,8 @@
 import { InputProps } from 'antd/lib/input';
 import { PopconfirmProps } from 'antd/lib/popconfirm';
+import { FormInstance } from 'antd/lib/form';
 import React from 'react';
+import { ProColumnProps } from '../index';
 export interface ContainerProps {
     trigger?: 'click' | 'hover';
     size?: 'small' | 'middle' | 'large';
@@ -19,6 +21,7 @@ export interface PopupProps {
     trim?: boolean;
     labelWidth?: string | number;
     fieldProps?: any;
+    columns?: ProColumnProps;
     [key: string]: any;
 }
 export interface LabelProps extends InputProps {
@@ -34,10 +37,10 @@ export interface PopupConfirmProps extends Partial<PopconfirmProps> {
     viewEmpty?: '-';
     onConfirm?: (e?: any) => void;
     onFinish?: (e?: any) => void;
-    tip?: string | React.ReactNode;
-    dataSource?: any[];
-    transform?: () => any[];
-    title?: string | React.ReactNode;
+    onOpenChange?: (e?: any) => void;
+    trigger?: 'click' | 'hover';
+    value?: any;
+    form?: FormInstance;
     disabled?: boolean;
     [key: string]: any;
 }

package/lib/ProEditLabel/style/index.less

@@ -1,9 +1,15 @@
 .pro-edit-label {
   display: inline-block;
 
+  .pro-form-view {
+    .ant-row {
+      display: block;
+    }
+  }
+
   .pro-form-view-container {
     word-break: break-all;
-    display: inline-block;
+    display   : inline-block;
   }
 
   &.trigger-hover {
@@ -50,8 +56,34 @@
 }
 
 .ant-popover {
+  .ant-btn-sm {
+    font-size  : 12px;
+    min-width  : 56px;
+    line-height: 1;
+
+    span {
+      letter-spacing: -1px;
+    }
+
+  }
+}
+
+.pro-edit-label-popconfirm {
   z-index: 1029 !important;
 
+  .ant-popover-message {
+    display: block;
+  }
+
+  .ant-popover-message-title {
+    padding-left: 0;
+  }
+
+  .ant-popover-content {
+    width    : 360px;
+    max-width: 400px;
+  }
+
   .pro-edit-label-title {
     font-size    : 16px;
     font-weight  : 500;
@@ -60,7 +92,6 @@
   }
 
   .pro-edit-label-tip {
-    max-width    : 300px;
     margin-bottom: var(--zaui-space-size-md, 16px);
     color        : #666;
 

package/lib/ProEditLabel/utils/index.d.ts

@@ -1,9 +1,7 @@
 /**
- * Input TextArea 移除前后空格
- * @param type 组件类型
- * @param trim 是否移除前后空格
- * @returns {}
+ * 判断columns的length是否为1，给表单赋值，默认匹配到value上
+ * @param value 表单值
+ * @param columns 表单配置项
+ * @returns value
  */
-export declare const isTrim: (type: string, trim: boolean) => any;
-export declare const isNullValue: (value: any) => boolean;
-export declare const isNullArray: (value: any, length: any) => boolean;
+export declare const matchFormValue: (value: any, columns: any) => any;

package/lib/ProEditLabel/utils/index.js

@@ -1,41 +1,24 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTrim = exports.isNullValue = exports.isNullArray = void 0;
+exports.matchFormValue = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 /**
- * Input TextArea 移除前后空格
- * @param type 组件类型
- * @param trim 是否移除前后空格
- * @returns {}
+ * 判断columns的length是否为1，给表单赋值，默认匹配到value上
+ * @param value 表单值
+ * @param columns 表单配置项
+ * @returns value
  */
-var isTrim = function isTrim(type, trim) {
-  var result = {};
-  if (['Input', 'TextArea'].includes(type) && trim) {
-    result.getValueFromEvent = function (event) {
-      return event.target.value.trim();
-    };
+var matchFormValue = function matchFormValue(value, columns) {
+  if (!Array.isArray(columns)) {
+    return value;
   }
-  return result;
-};
-// 判断一个字段值是否算空
-exports.isTrim = isTrim;
-var nullList = [undefined, 'null', '""', '[]'];
-var isNullValue = function isNullValue(value) {
-  return nullList.includes(JSON.stringify(value));
-};
-// 判断数组是否算空
-exports.isNullValue = isNullValue;
-var isNullArray = function isNullArray(value, length) {
-  if (Array.isArray(value)) {
-    for (var i = 0; i < length; i++) {
-      if (isNullValue(value[i])) {
-        return true;
-      }
-    }
-    return false;
+  if (columns.length === 1) {
+    return (0, _defineProperty2.default)({}, columns[0].name || columns[0].type, value);
   }
-  return !value;
+  return value;
 };
-exports.isNullArray = isNullArray;
+exports.matchFormValue = matchFormValue;

package/lib/ProEditTable/components/ActionButton/index.d.ts

@@ -1,2 +1,3 @@
-declare const ActionButton: ({ record, index, config, btnConfig }: any) => JSX.Element;
+import React from 'react';
+declare const ActionButton: ({ record, index, config, btnConfig }: any) => React.JSX.Element;
 export default ActionButton;

package/lib/ProEditTable/components/ActionButton/index.js

@@ -48,21 +48,37 @@ var ActionButton = function ActionButton(_ref) {
   if ((0, _lodash.isFunction)(btnConfig.label)) {
     btnConfig.label = /*#__PURE__*/_react.default.createElement(btnConfig.label, null);
   }
-  return isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+  var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
+  return isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
     placement: "topRight",
     title: deleteMsgMap[btnConfig.type],
     onConfirm: function onConfirm() {
       btnConfig.onClick(record, index);
     },
-    disabled: !selectedRowKeys.length && btnConfig.type === 'mulDelete',
+    disabled: isDisabled,
     okText: "\u786E\u8BA4",
     cancelText: "\u53D6\u6D88"
   }, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
     record: record,
-    index: index
+    index: index,
+    disabled: isDisabled
   })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+    disabled: isDisabled,
     type: "link"
-  }), btnConfig.label)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+  }), btnConfig.label)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+    record: record,
+    index: index,
+    disabled: isDisabled,
+    onClick: function onClick() {
+      btnConfig.onClick(record, index);
+    }
+  })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+    disabled: isDisabled,
+    type: "link",
+    onClick: function onClick() {
+      btnConfig.onClick(record, index);
+    }
+  }), btnConfig.label))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
     record: record,
     index: index
   })) : /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({

package/lib/ProEditTable/components/RenderField/index.d.ts

@@ -1,2 +1,3 @@
-declare const RenderField: ({ text: value, record, index, column, config }: any) => JSX.Element;
+import React from 'react';
+declare const RenderField: ({ text: value, record, index, column, config }: any) => React.JSX.Element;
 export default RenderField;

package/lib/ProEditTable/components/RenderField/index.js

@@ -22,6 +22,8 @@ var componentMap = _interopRequireWildcard(require("../../../ProForm/components"
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _excluded = ["type", "valueType", "rules", "names", "fieldProps", "required", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable"];
+/* eslint-disable prefer-destructuring */
+/* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _names, _fieldProps$rules, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
@@ -213,7 +215,7 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = viewRender;
     }
   }
-  var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangerPicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "\u8BF7\u9009\u62E9".concat((0, _lodash.isString)(label) ? label || title : '') : "\u8BF7\u8F93\u5165".concat((0, _lodash.isString)(label) ? label || title : '');
+  var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangePicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "\u8BF7\u9009\u62E9".concat((0, _lodash.isString)(label) ? label || title : '') : "\u8BF7\u8F93\u5165".concat((0, _lodash.isString)(label) ? label || title : '');
   var _placeholder = (_formItemChildProps$p = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.placeholder) !== null && _formItemChildProps$p !== void 0 ? _formItemChildProps$p : defaultPlaceholder;
   var _disabled = disabled || (formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.disabled);
   var _rules = isEditing ? _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.rules : [];
@@ -446,7 +448,6 @@ var RenderField = function RenderField(_ref) {
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["$".concat(dataIndex, "Disabled")] = _disabled;
-    form.setFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index, "$".concat(dataIndex, "Disabled")]), _disabled);
   }
   // if (isCell) {
   //   _formItemProps.validateTrigger = 'onBlur';

package/lib/ProEditTable/components/RenderToolbar/index.d.ts

@@ -1,2 +1,3 @@
-declare const RenderToolbar: (config: any) => JSX.Element;
+import React from 'react';
+declare const RenderToolbar: (config: any) => React.JSX.Element;
 export default RenderToolbar;

package/lib/ProEditTable/components/Summary/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { SummaryColumnProps } from '../../propsType';
 interface SummaryProps<T = any> {
     data: T[];
@@ -8,5 +9,5 @@ interface SummaryProps<T = any> {
     };
     rowSelection: any;
 }
-declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => JSX.Element;
+declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => React.JSX.Element;
 export default Summary;

package/lib/ProEditTable/propsType.d.ts

@@ -38,6 +38,11 @@ export interface BaseActionProps<T> {
      * @default           true
      */
     show?: boolean | ShowFunction<T>;
+    /**
+     * @description       删除是否开启二次确认
+     * @default           true
+     */
+    needConfirm?: boolean;
     /**
      * @description       按钮是否禁止操作
      * @default           -

package/lib/ProEditTable/style/index.less

@@ -38,12 +38,13 @@
   }
 
 
-  .is-cell .ant-form-item .ant-form-item-row .ant-form-item-control .ant-form-item-control-input  {
+  .is-cell .ant-form-item .ant-form-item-row .ant-form-item-control .ant-form-item-control-input {
     border: 1px solid transparent;
+
     &:hover {
-      border: 1px solid #DEE0E3;
+      border       : 1px solid #DEE0E3;
       border-radius: 4px;
-      text-indent: 5px;
+      text-indent  : 5px;
     }
   }
 
@@ -87,13 +88,15 @@
 
   .ant-table-content {
     >table {
-
-      .ant-table-cell-fix-right-first::after,
-      .ant-table-cell-fix-right-last::after {
-        width     : auto;
-        transform : none;
-        transition: none;
-        box-shadow: none;
+      .ant-table-summary {
+        background-color: var(--zaui-table-header-bg, #f2f3f5);
+        color           : #343434;
+        font-weight     : 600;
+
+        .ant-table-cell-fix-left,
+        .ant-table-cell-fix-right {
+          background-color: var(--zaui-table-header-bg, #f2f3f5);
+        }
       }
 
       td {
@@ -149,7 +152,7 @@
   .ant-table-thead>tr>th {
     border          : 0;
     white-space     : nowrap;
-    background-color: #F6F7F8;
+    background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 
   .ant-table-thead>tr>th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
@@ -173,7 +176,7 @@
   }
 
   .ant-table-tbody tr:nth-child(2n)>td {
-    background-color: #f7f9fc;
+    background-color: var(--zaui-table-strip-bg, #FAFAFA);
   }
 
   .ant-table-tbody>.ant-table-placeholder>td {
@@ -207,7 +210,7 @@
     }
   }
 
-  .ant-table-summary > tr > td {
+  .ant-table-summary>tr>td {
     border-bottom: none;
   }
 }

package/lib/ProEditTable/utils/config.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export declare const defaultBtnNameMap: {
     add: string;
     edit: string;
@@ -9,7 +10,7 @@ export declare const defaultBtnNameMap: {
     custom: string;
 };
 export declare const iconMap: {
-    add: JSX.Element;
+    add: React.JSX.Element;
 };
 export declare const defaultSingleActionKeys: string[];
 export declare const defaultMultipleActionKeys: string[];

package/lib/ProEditTable/utils/config.js

@@ -61,7 +61,11 @@ var actions = {
     // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
-    record.isEditing = Boolean(nextEditingKeys.length);
+    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+      record.isEditing = true;
+    } else {
+      delete record.isEditing;
+    }
     // 复制当前行数据
     form.setFieldValue(virtualRowName, record);
     setState({
@@ -83,7 +87,11 @@ var actions = {
             nextEditingKeys = editingKeys.filter(function (key) {
               return key !== record.rowKey;
             }); // 保存后取消编辑状态，供validator做保存校验
-            record.isEditing = Boolean(nextEditingKeys.length);
+            if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+              record.isEditing = true;
+            } else {
+              delete record.isEditing;
+            }
             form.setFieldValue(rowName, record);
             setState({
               editingKeys: nextEditingKeys
@@ -111,7 +119,11 @@ var actions = {
       return key !== record.rowKey;
     });
     // 保存后取消编辑状态，供validator做保存校验
-    record.isEditing = Boolean(nextEditingKeys.length);
+    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+      record.isEditing = true;
+    } else {
+      delete record.isEditing;
+    }
     setState({
       editingKeys: nextEditingKeys
     }); // 关闭编辑状态
@@ -173,18 +185,17 @@ var actions = {
       _antd.message.warning(onlyOneLineMsg);
       return false;
     }
+    var rowKey = (0, _tools.getRandom)();
     // 添加新增对象数据
-    var addData = (0, _typeof2.default)(result) === 'object' ? result : {};
-    var rowKey = Math.random().toString(36).slice(-6);
-    insertType === 'before' ? nextData.unshift((0, _objectSpread2.default)((0, _objectSpread2.default)({}, addData), {}, {
-      addFlag: true,
-      isEditing: true,
-      rowKey: rowKey
-    })) : nextData.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, addData), {}, {
-      addFlag: true,
-      isEditing: true,
+    var addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _typeof2.default)(result) === 'object' ? result : {}), {}, {
       rowKey: rowKey
-    }));
+    });
+    // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
+    if (virtualKey) {
+      addData.addFlag = true;
+      addData.isEditing = true;
+    }
+    insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
     form.setFieldValue(name, nextData);
     // 当单选情况下，存储正在编辑值
     if (virtualKey) {

package/lib/ProEditTable/utils/index.js

@@ -22,7 +22,7 @@ var _tools = require("./tools");
 var _ProTooltip = _interopRequireDefault(require("../../ProTooltip"));
 var _components = require("../components");
 var _tip = _interopRequireDefault(require("../../assets/tip.svg"));
-var _excluded = ["type", "label", "show", "onHandle", "onClick"],
+var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
@@ -65,15 +65,17 @@ var getActionColumn = function getActionColumn(config) {
     var type = action.type,
       label = action.label,
       show = action.show,
+      needConfirm = action.needConfirm,
       onHandle = action.onHandle,
       onClick = action.onClick,
       buttonProps = (0, _objectWithoutProperties2.default)(action, _excluded);
     action.isEditable = _config.defaultEditingActionKeys.includes(type);
     action.label = label !== null && label !== void 0 ? label : _config.defaultBtnNameMap[type];
     action.show = show !== null && show !== void 0 ? show : true;
+    action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onClick = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var _yield$action$onHandl, _action$onHandle;
+        var _form$getFieldValue, _yield$action$onHandl, _action$onHandle;
         var rowName, _record, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -87,7 +89,7 @@ var getActionColumn = function getActionColumn(config) {
               return (0, _tools.customValidate)(validateKeys, form, rowName);
             case 4:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
-              _record = record.isEditing ? form.getFieldValue(rowName) : record; // 新增事件可以设置初始默认值，当做函数的出参导出
+              _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               _context.next = 7;
               return action === null || action === void 0 ? void 0 : (_action$onHandle = action.onHandle) === null || _action$onHandle === void 0 ? void 0 : _action$onHandle.call(action, _record, index);
             case 7:

package/lib/ProEnum/getEnumLabel.d.ts

@@ -1,2 +1,3 @@
-declare const getEnumLabel: (enumCode: string, value: any, compose?: boolean, code?: string, label?: string) => JSX.Element;
+import React from 'react';
+declare const getEnumLabel: (enumCode: string, value: any, compose?: boolean, code?: string, label?: string) => React.JSX.Element;
 export default getEnumLabel;

package/lib/ProEnum/index.d.ts

@@ -1,8 +1,9 @@
+import React from 'react';
 import useEnum from './useEnum';
 import { ProEnumProps } from './propsType';
 declare const ProEnum: {
-    (props: ProEnumProps): JSX.Element;
-    getEnumLabel: (enumCode: string, value: any, compose?: boolean, code?: string, label?: string) => JSX.Element;
+    (props: ProEnumProps): React.JSX.Element;
+    getEnumLabel: (enumCode: string, value: any, compose?: boolean, code?: string, label?: string) => React.JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/lib/ProEnum/useEnumRequest.js

@@ -47,7 +47,7 @@ var useEnum = function useEnum(props, dispatch) {
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       setCache: function () {
         var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
-          var response, _useRequest$options, ignoreCodes, _i, _Object$keys, key, options;
+          var response, _useRequest$options, ignoreCodes, _i, _Object$keys, key, options, cacheData;
           return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -85,15 +85,10 @@ var useEnum = function useEnum(props, dispatch) {
                   }
                   res.data = response;
                 }
-                // const cacheData = getEnumData(storage, cacheKey) || { data: {} };
-                // // 缓存数据
-                // setEnumData(storage, cacheKey, {
-                //   ...res,
-                //   data: {
-                //     ...res.data,
-                //     ...cacheData?.data,
-                //   },
-                // });
+                cacheData = (0, _utils.getEnumData)(storage, cacheKey) || {
+                  data: {}
+                }; // 合并缓存数据
+                res.data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
                 (0, _utils.setEnumData)(storage, cacheKey, res);
                 // 同步数据到全局
                 dispatch({
@@ -101,7 +96,7 @@ var useEnum = function useEnum(props, dispatch) {
                   payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), res.data)
                 });
                 return _context.abrupt("return", res);
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }

package/lib/ProForm/components/base/DatePicker/index.js

@@ -19,7 +19,7 @@ var _excluded = ["className", "format", "otherProps"];
 var DatePicker = function DatePicker(props) {
   var className = props.className,
     _props$format = props.format,
-    format = _props$format === void 0 ? 'YYYY-MM-DD HH:mm:ss' : _props$format,
+    format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},

package/lib/ProForm/components/base/FormList/components/ActionButton.js

@@ -10,8 +10,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
-var _icons = _interopRequireWildcard(require("@ant-design/icons"));
-var _delete = require("../../../../../assets/delete.svg");
+var _icons = require("@ant-design/icons");
+var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "title"],
   _excluded2 = ["onClick", "label"];
 var getDefaultActions = function getDefaultActions(mode) {
@@ -32,9 +32,8 @@ var getDefaultActions = function getDefaultActions(mode) {
       },
       type: 'text',
       label: '删除',
-      // icon: <ReactSVG src={deleteIcon} />,
-      icon: /*#__PURE__*/_react.default.createElement(_icons.default, {
-        component: _delete.ReactComponent
+      icon: /*#__PURE__*/_react.default.createElement(_ProIcon.default, {
+        type: "delete"
       })
     },
     copy: {

package/lib/ProForm/components/base/FormList/index.d.ts

@@ -31,6 +31,7 @@ export interface Props {
     mode?: FormListMode;
     level?: string;
     disabled?: boolean;
+    span?: number;
     meta: {
         errors: React.ReactNode[];
         warnings: React.ReactNode[];

package/lib/ProForm/components/base/FormList/index.js

@@ -26,12 +26,13 @@ var FormList = function FormList(props, ref) {
     operation = props.operation,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'line' : _props$mode,
-    meta = props.meta;
+    meta = props.meta,
+    _props$span = props.span,
+    span = _props$span === void 0 ? 8 : _props$span;
   var form = otherProps.form,
     name = otherProps.name,
     isView = otherProps.isView,
-    disabled = otherProps.disabled,
-    colProps = otherProps.colProps;
+    disabled = otherProps.disabled;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
@@ -68,7 +69,9 @@ var FormList = function FormList(props, ref) {
       namePath: namePath,
       index: index,
       field: field,
-      colProps: colProps,
+      colProps: {
+        span: span
+      },
       form: form
     })) : /*#__PURE__*/_react.default.createElement(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       key: field.key
@@ -80,7 +83,9 @@ var FormList = function FormList(props, ref) {
       namePath: namePath,
       index: index,
       field: field,
-      colProps: colProps,
+      colProps: {
+        span: span
+      },
       form: form
     }));
   }), /*#__PURE__*/_react.default.createElement(_antd.Form.ErrorList, {

package/lib/ProForm/components/base/FormList/style/index.less

@@ -33,4 +33,7 @@
   .ant-btn-link {
     padding: 4px 0;
   }
+  .ant-btn-text:hover {
+    background: transparent;
+  }
 }

package/lib/ProForm/components/base/Input/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { IProps } from './propsType';
-declare const Input: (props: IProps) => JSX.Element;
+declare const Input: (props: IProps) => React.JSX.Element;
 export default Input;