cloud-b2b 1.1.7 → 1.1.10

package/es/SuperTable2/SuperTable2.js

@@ -11,6 +11,7 @@ import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _Table from "antd/es/table";
+import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _Switch from "antd/es/switch";
 import _Button from "antd/es/button";
@@ -23,16 +24,17 @@ import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+var _excluded = ["onRowClick"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray(o, minLen) { var _context13; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context13 = Object.prototype.toString.call(o)).call(_context13, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context16; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context16 = Object.prototype.toString.call(o)).call(_context16, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context11, _context12; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context11 = ownKeys(Object(source), !0)).call(_context11, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context12 = ownKeys(Object(source))).call(_context12, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context14, _context15; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context14 = ownKeys(Object(source), !0)).call(_context14, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context15 = ownKeys(Object(source))).call(_context15, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
@@ -41,6 +43,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
+import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -50,18 +53,19 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_R
 import React from 'react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
-import { getTitle } from '../Control';
+import Control, { getTitle } from '../Control';
 import SuperTableCell from './SuperTableCell';
 import fixed from '../SuperTable/fixed';
 import SuperToolbar from '../SuperToolbar';
 import variables from '../variables';
-import helper from '../helper';
+import helper, { getObjectExclude } from '../helper';
+import DragSortRow from "../SuperTable/DragSortRow";
 var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select', //存储value
 'selectText', //存储title
 'search', 'searchText', 'selectSearch', //多选下拉搜索
 'date', 'button', 'custom', 'switch', 'textArea', 'link', 'toolbar', //按钮组
-'img' //图片标题组 value为{src,title}时显示图片标题   为字符串时   只显示图片
-];
+'img', //图片标题组 value为{src,title}时显示图片标题   为字符串时   只显示图片
+'uploadImg'];
 /**
  * key：标识所在列，在一个表格中必须唯一
  * title：列的标题，type为checkbox时，title为空字符串时，表头才会显示为复选框
@@ -90,22 +94,32 @@ var ColType = {
 /**
  * onCheck：点击复选框时触发，原型func(rowIndex, keyName, checked)
  * onContentChange: 输入框内容改变时触发，原型为function(rowIndex, keyName, value)
- * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value)
+ * onBlur: 输入框失去焦点时触发，原型为function(rowIndex, keyName, value)
+ * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value, col)
  * onLink: 点击超链接时触发，原型为function(keyName, rowIndex, item)
  * onAdd：点击+号时触发，原型为function(keyName)
  * onRenderCustom：(废弃)用于渲染type为custom类型的单元格，原型为function(rowIndex, keyName, value，props)
- * onToolbar:点击表格列按钮组时触发，原型为function(按钮组列的key,rowIndex,该行数据的值,按钮key)
+ * onToolbar:点击表格列按钮组时触发，原型为function(按钮组列的key,rowIndex,该行数据的值,按钮key);
+ * onDoubleClick: 双击单元格触发（只针对于type类型为空的情况下）
  */
 
 var CallbackType = {
   onExitValid: PropTypes.func,
   onCheck: PropTypes.func,
   onContentChange: PropTypes.func,
+  onBlur: PropTypes.func,
   onSearch: PropTypes.func,
   onLink: PropTypes.func,
   onAdd: PropTypes.func,
   onRenderCustom: PropTypes.func,
-  onToolbar: PropTypes.func
+  onToolbar: PropTypes.func,
+  onDoubleClick: PropTypes.func,
+  onTableFileChange: PropTypes.func,
+  buildSuperUploadProps: PropTypes.func,
+  //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+  onImgTileClick: PropTypes.func,
+  //点击img类型标题触发事件
+  onMoveRow: PropTypes.func
 };
 /**
  * base[可选]：序号的开始数字，所有回调函数中的序号值都会加上这个值，默认值为0
@@ -186,8 +200,40 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onBlur", function () {
-      _this.closeValid();
+    _defineProperty(_assertThisInitialized(_this), "onBlur", function (key, rowIndex) {
+      return function (value) {
+        var _ref7 = _this.props.callback || {},
+            onBlur = _ref7.onBlur;
+
+        _this.closeValid();
+
+        onBlur && onBlur(_this.getIndex(rowIndex), key, value);
+      };
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onDoubleClick", function (key, value) {
+      return function () {
+        var _ref8 = _this.props.callback || {},
+            onDoubleClick = _ref8.onDoubleClick;
+
+        onDoubleClick && onDoubleClick(key, value);
+      };
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onImgTileClick", function (col, value, rowIndex) {
+      return function () {
+        var _ref9 = _this.props.callback || {},
+            onImgTileClick = _ref9.onImgTileClick;
+
+        onImgTileClick && onImgTileClick(col, value, rowIndex);
+      };
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onMoveRow", function (dragIndex, targetIndex) {
+      var _ref10 = _this.props.callback || {},
+          onMoveRow = _ref10.onMoveRow;
+
+      onMoveRow && onMoveRow(dragIndex, targetIndex);
     });
 
     _defineProperty(_assertThisInitialized(_this), "closeValid", function () {
@@ -249,7 +295,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         options: _this.getOptions(key, options, index),
         onChange: _this.onChange(key, index),
         onSearch: _this.onSearch(key, index, config),
-        onBlur: _this.onBlur
+        onBlur: _this.onBlur(key, index)
       };
 
       if (showRowAdd && _Array$isArray(isRequired) && _includesInstanceProperty(isRequired).call(isRequired, key)) {
@@ -329,8 +375,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var split = index2 === list.length - 1 ? '' : ',';
 
           var onClick = function onClick() {
-            var _ref7 = _this.props.callback || {},
-                onLink = _ref7.onLink;
+            var _ref11 = _this.props.callback || {},
+                onLink = _ref11.onLink;
 
             onLink && onLink(col.key, index, item2);
           };
@@ -344,8 +390,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         var title = typeof col.link === 'string' ? col.link : value;
 
         var onClick = function onClick() {
-          var _ref8 = _this.props.callback || {},
-              onLink = _ref8.onLink;
+          var _ref12 = _this.props.callback || {},
+              onLink = _ref12.onLink;
 
           onLink && onLink(col.key, index, record);
         };
@@ -362,13 +408,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getCellRender", function (col) {
       return function (value, record, index) {
-        var _context3, _context4, _context5, _context6;
+        var _context3, _context4, _context5, _context6, _context7;
 
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
 
         if (!realType) {
           return /*#__PURE__*/React.createElement("div", {
+            onDoubleClick: _this.onDoubleClick(col.key, record.key),
             style: {
+              minHeight: '20px',
+              minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
               overflow: 'hidden',
               textOverflow: 'ellipsis'
@@ -412,12 +461,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             }
 
           case 'switch':
-            return value === 'noneDisplay' ? /*#__PURE__*/React.createElement("div", null) : /*#__PURE__*/React.createElement(_Switch, {
+            return typeof value === 'string' ? /*#__PURE__*/React.createElement("div", null, value) : /*#__PURE__*/React.createElement(_Switch, {
               checkedChildren: col.props.checkedChildren || '',
               unCheckedChildren: col.props.unCheckedChildren || '',
               onChange: _this.onSwitch(col.key, record.key),
               size: "default",
-              checked: value || false,
+              checked: typeof value === 'number' ? Boolean(value) : value || false,
               disabled: !(record._isEdit === true)
             });
 
@@ -444,14 +493,46 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
                 height: '80px'
               }
             }) : /*#__PURE__*/React.createElement("div", {
-              role: 'imgBox'
+              role: 'imgBox',
+              style: {
+                maxWidth: "".concat(col.width, "px")
+              }
             }, /*#__PURE__*/React.createElement("img", {
               src: value.img,
               style: {
                 width: '80px',
                 height: '80px'
               }
-            }), /*#__PURE__*/React.createElement("span", null, value.title)) : /*#__PURE__*/React.createElement("div", null);
+            }), /*#__PURE__*/React.createElement("div", {
+              style: {
+                display: 'inline-block'
+              }
+            }, /*#__PURE__*/React.createElement("span", {
+              style: {
+                display: 'block',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                width: '80px'
+              },
+              onClick: _this.onImgTileClick(col, record, index)
+            }, value.title), helper.isEmpty2(value.remark) ? null : /*#__PURE__*/React.createElement("span", {
+              style: {
+                color: '#333'
+              }
+            }, value.remark))) : /*#__PURE__*/React.createElement("div", null);
+
+          case 'uploadImg':
+            var commonProps = _this.props.callback.buildSuperUploadProps ? _this.props.callback.buildSuperUploadProps() : {};
+
+            var uploadProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              onFileChange: _this.props.callback.onTableFileChange ? _bindInstanceProperty(_context7 = _this.props.callback.onTableFileChange).call(_context7, null, col.key, index) : undefined,
+              type: col.type
+            }, col.props), _this.props), commonProps), {}, {
+              value: _this.props.items[index][col.key]
+            });
+
+            return /*#__PURE__*/React.createElement(Control, uploadProps);
 
           default:
             return _this.renderEditableCell(_objectSpread(_objectSpread({}, col), {}, {
@@ -500,12 +581,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref9) {
-      var required = _ref9.required,
-          title = _ref9.title,
-          type = _ref9.type,
-          key = _ref9.key,
-          showAdd = _ref9.showAdd;
+    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref13) {
+      var required = _ref13.required,
+          title = _ref13.title,
+          type = _ref13.type,
+          key = _ref13.key,
+          showAdd = _ref13.showAdd;
 
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
@@ -521,9 +602,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref10) {
-      var type = _ref10.type,
-          align = _ref10.align;
+    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref14) {
+      var type = _ref14.type,
+          align = _ref14.align;
 
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
@@ -533,24 +614,26 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "canReadonly", function (type) {
-      var _context7;
+      var _context8;
 
-      return !_includesInstanceProperty(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
+      return !_includesInstanceProperty(_context8 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context8, type);
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols) {
-      var _context8;
+      var _context9;
 
       var readonly = _this.props.readonly;
-      return _mapInstanceProperty(_context8 = _filterInstanceProperty(cols).call(cols, function (col) {
+      return _mapInstanceProperty(_context9 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context8, function (_ref11, index) {
-        var col = _extends({}, _ref11);
+      })).call(_context9, function (_ref15, index) {
+        var _context10;
+
+        var col = _extends({}, _ref15);
 
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
-        col.width = col.width || 120; // const {props = {}} = col;
+        col.width = col.width ? col.width : _includesInstanceProperty(_context10 = ['index', 'checked']).call(_context10, col.key) ? 70 : col.type === 'img' ? 200 : 120; // const {props = {}} = col;
         // const {edit = false} = props
         // if (!(readonly || col.type === 'readonly') || !this.canReadonly(col.type)) {
         // if ( !edit && ['text', 'number', 'select', 'date', 'search', 'readonly', 'textArea', 'selectSearch'].includes(col.type)){
@@ -571,14 +654,14 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getDataSource", function (items, cols) {
       return _mapInstanceProperty(items).call(items, function (item, index) {
-        return _reduceInstanceProperty(cols).call(cols, function (result, _ref12) {
-          var _context9;
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref16) {
+          var _context11;
 
-          var key = _ref12.key,
-              type = _ref12.type,
-              options = _ref12.options;
+          var key = _ref16.key,
+              type = _ref16.type,
+              options = _ref16.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context9 = item.isReadonly).call(_context9, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context11 = item.isReadonly).call(_context11, key))) {
             result[key] = item[key];
           } else {
             result[key] = getTitle(item[key], options);
@@ -611,38 +694,172 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getProps", function () {
-      var _context10;
+    _defineProperty(_assertThisInitialized(_this), "getSelectedRowKeys", function (items) {
+      return _reduceInstanceProperty(items).call(items, function (result, item, index) {
+        item.checked && result.push(index);
+        return result;
+      }, []);
+    });
 
+    _defineProperty(_assertThisInitialized(_this), "getPropsByCheckbox2", function (items) {
       var _this$props3 = _this.props,
-          cols = _this$props3.cols,
-          items = _this$props3.items,
-          _this$props3$style = _this$props3.style,
-          style = _this$props3$style === void 0 ? {} : _this$props3$style,
-          _this$props3$footer = _this$props3.footer,
-          footer = _this$props3$footer === void 0 ? null : _this$props3$footer,
-          _this$props3$paginati = _this$props3.pagination,
-          pagination = _this$props3$paginati === void 0 ? false : _this$props3$paginati,
+          _this$props3$checkbox = _this$props3.checkbox,
+          checkbox = _this$props3$checkbox === void 0 ? true : _this$props3$checkbox,
+          _this$props3$radio = _this$props3.radio,
+          radio = _this$props3$radio === void 0 ? false : _this$props3$radio,
+          isolation = _this$props3.isolation,
+          _this$props3$checkedR = _this$props3.checkedRows,
+          checkedRows = _this$props3$checkedR === void 0 ? [] : _this$props3$checkedR,
           _this$props3$isEmphas = _this$props3.isEmphasized,
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
-          maxHeight = _this$props3.maxHeight,
-          _this$props3$expanded = _this$props3.expandedRowRender,
-          expandedRowRender = _this$props3$expanded === void 0 ? undefined : _this$props3$expanded,
-          _this$props3$onExpand = _this$props3.onExpand,
-          onExpand = _this$props3$onExpand === void 0 ? undefined : _this$props3$onExpand;
+          _this$props3$isWeaken = _this$props3.isWeaken,
+          isWeaken = _this$props3$isWeaken === void 0 ? true : _this$props3$isWeaken;
+
+      var rowClassName1 = function rowClassName1(record) {
+        if (items[record.key].__total) return variables('SuperTable').totalRow;
+        if (items[record.key].__warningRow) return variables('SuperTable').warningRow;
+        return _includesInstanceProperty(checkedRows).call(checkedRows, record.key) ? variables('SuperTable').select : '';
+      };
 
-      var widthX = _reduceInstanceProperty(_context10 = _filterInstanceProperty(cols).call(cols, function (col) {
+      var rowClassName2 = function rowClassName2(record) {
+        if (items[record.key].__total) return variables('SuperTable').totalRow;
+        if (items[record.key].__warningRow) return variables('SuperTable').warningRow;
+
+        if (isEmphasized && items[record.key].__isEmphasized) {
+          return items[record.key].checked ? variables('SuperTable').emphasizedSelectRow : variables('SuperTable').emphasizedUnselectRow;
+        }
+
+        if (isWeaken && items[record.key].__isWeaken) {
+          return items[record.key].checked ? variables('SuperTable').weakenedSelectRow : variables('SuperTable').weakenedUnselectRow;
+        }
+
+        return items[record.key].checked ? variables('SuperTable').select : '';
+      };
+
+      if (checkbox) {
+        if (radio) {
+          return {
+            rowClassName: rowClassName1,
+            onRowClick: _this.onRadioRowClick,
+            rowSelection: {
+              type: 'radio',
+              selectedRowKeys: checkedRows,
+              onChange: _this.onRadioChange
+            }
+          };
+        } else if (isolation) {
+          return {
+            rowClassName: rowClassName1,
+            onRowClick: _this.onRowClick,
+            rowSelection: {
+              selectedRowKeys: checkedRows,
+              onChange: _this.onCheckChange,
+              getCheckboxProps: function getCheckboxProps(record) {
+                var checked = _includesInstanceProperty(checkedRows).call(checkedRows, record.key);
+
+                return {
+                  checked: checked,
+                  disabled: items[record.key].__isWeaken,
+                  style: items[record.key].__total ? {
+                    display: 'none'
+                  } : {}
+                };
+              }
+            }
+          };
+        } else {
+          return {
+            rowClassName: rowClassName2,
+            onRowClick: _this.onRowClick,
+            rowSelection: {
+              selectedRowKeys: _this.getSelectedRowKeys(items),
+              onChange: _this.onChange,
+              getCheckboxProps: function getCheckboxProps(record) {
+                var checked = isWeaken && items[record.key].__isWeaken ? false : !!record.checked;
+                return {
+                  checked: checked,
+                  disabled: items[record.key].__isWeaken,
+                  style: items[record.key].__total ? {
+                    display: 'none'
+                  } : {}
+                };
+              }
+            }
+          };
+        }
+      } else {
+        return {
+          rowClassName: rowClassName2
+        };
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getRowPropsForDrag", function () {
+      return function (record, index) {
+        return {
+          index: index,
+          onMoveRow: _this.onMoveRow
+        };
+      };
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getRowProps", function (onRowClick) {
+      return function (record) {
+        return {
+          onClick: function onClick() {
+            return onRowClick && onRowClick(record);
+          },
+          onDoubleClick: function onDoubleClick() {
+            return _this.onDoubleClick(record);
+          }
+        };
+      };
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getProps", function () {
+      var _context12;
+
+      var _this$props4 = _this.props,
+          cols = _this$props4.cols,
+          items = _this$props4.items,
+          _this$props4$style = _this$props4.style,
+          style = _this$props4$style === void 0 ? {} : _this$props4$style,
+          _this$props4$footer = _this$props4.footer,
+          footer = _this$props4$footer === void 0 ? null : _this$props4$footer,
+          _this$props4$paginati = _this$props4.pagination,
+          pagination = _this$props4$paginati === void 0 ? false : _this$props4$paginati,
+          dragSort = _this$props4.dragSort,
+          _this$props4$isEmphas = _this$props4.isEmphasized,
+          isEmphasized = _this$props4$isEmphas === void 0 ? false : _this$props4$isEmphas,
+          maxHeight = _this$props4.maxHeight,
+          _this$props4$expanded = _this$props4.expandedRowRender,
+          expandedRowRender = _this$props4$expanded === void 0 ? undefined : _this$props4$expanded,
+          _this$props4$onExpand = _this$props4.onExpand,
+          onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand;
+
+      var widthX = _reduceInstanceProperty(_context12 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context10, function (width, item) {
-        return width += item.width ? item.width : 120;
+      })).call(_context12, function (width, item) {
+        var _context13;
+
+        return width += item.width ? item.width : _includesInstanceProperty(_context13 = ['index', 'checked']).call(_context13, item.key) ? 70 : item.type === 'img' ? 200 : 120;
       }, 0);
 
-      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {} : {
+      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {
+        expandedRowRender: expandedRowRender
+      } : {
         scroll: {
-          x: widthX,
+          x: _someInstanceProperty(cols).call(cols, function (item) {
+            return !helper.isEmpty2(item.fixed);
+          }) ? widthX : true,
           y: maxHeight
         }
       };
+
+      var _this$getPropsByCheck = _this.getPropsByCheckbox2(items),
+          onRowClick = _this$getPropsByCheck.onRowClick,
+          extraProps = _objectWithoutProperties(_this$getPropsByCheck, _excluded);
+
       return _objectSpread(_objectSpread({
         className: !isEmphasized ? variables('SuperTable2') : variables('SuperTable2').noTransition,
         columns: _this.getColumns(cols),
@@ -653,11 +870,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         size: 'small',
         pagination: pagination,
         footer: footer,
+        onRow: dragSort ? _this.getRowPropsForDrag() : _this.getRowProps(onRowClick),
+        components: dragSort ? {
+          body: {
+            row: DragSortRow
+          }
+        } : {},
         locale: _this.props.emptyText ? {
           emptyText: _this.props.emptyText
         } : null
       }, _this.getPropsByCheckbox()), {}, {
-        expandedRowRender: expandedRowRender,
         onExpand: onExpand
       }, scrollProps);
     });
@@ -709,7 +931,8 @@ _defineProperty(SuperTable2, "propTypes", {
   emptyText: PropTypes.string,
   footer: PropTypes.func,
   callback: PropTypes.shape(CallbackType),
-  isEmphasized: PropTypes.bool
+  isEmphasized: PropTypes.bool,
+  dragSort: PropTypes.bool
 });
 
 export default SuperTable2;

package/es/SuperUpload/SuperUpload.js

@@ -25,7 +25,7 @@ import PropTypes from 'prop-types';
 import helper from '../helper';
 import Title from '../Title';
 import variables from '../variables';
-var FORMATS = ['image/jpeg', 'image/gif', 'image/bmp', 'image/jpg', 'image/png', 'image/tiff', 'image/gif', 'image/pcx', 'image/tga', 'image/exif', 'image/fpx', 'image/svg', 'image/psd', 'image/cdr', 'image/pcd', 'image/dxf', 'image/ufo', 'image/eps', 'image/ai', 'image/raw', 'image/WMF'];
+var FORMATS = ['image/jpeg', 'image/gif', 'image/bmp', 'image/jpg', 'image/png', 'image/tiff', 'image/gif', 'image/pcx', 'image/tga', 'image/exif', 'image/fpx', 'image/svg', 'image/psd', 'image/cdr', 'image/pcd', 'image/dxf', 'image/ufo', 'image/eps', 'image/ai', 'image/raw', 'image/WMF', 'video/mp4'];
 var FORMATS1 = ['.jpeg', '.gif', '.bmp', '.jpg', '.png', '.tiff', '.pcx', '.tga', '.exif', '.fpx', '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.raw', '.WMF']; //组件属性定义
 
 var propTypes = {
@@ -38,7 +38,7 @@ var propTypes = {
   required: PropTypes.bool,
   //是否必须上传,默认false
   listType: PropTypes.oneOf[('text', 'picture', 'picture-card')],
-  //上传列表的内建样式，支持三种,默认text
+  //上传列表的内建样式，支持三种,默认picture-card
   readonly: PropTypes.bool,
   //所在页面是否只读,默认false
   multiple: PropTypes.bool,

package/lib/CodeInput/CodeInput.js

@@ -110,12 +110,10 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
 
             case 3:
               if (!_context.sent) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
 
-              debugger;
-
               _this.setState({
                 time: _this.props.time || 60
               });
@@ -131,10 +129,10 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
                 }
               }, 1000);
 
-            case 8:
+            case 7:
               ;
 
-            case 9:
+            case 8:
             case "end":
               return _context.stop();
           }

package/lib/NumberInput/NumberInput.js

@@ -194,9 +194,9 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
         if (!invalid) {
           onChange && onChange(value);
         }
-      }
 
-      onBlur && onBlur(event);
+        onBlur && onBlur(event); //有输入才触发外部失去焦点事件，避免非必要请求
+      }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "hasSpecialChar", function (value) {
       if ((0, _includes["default"])(value).call(value, '+')) {