cloud-b2b 1.1.8 → 1.1.9

package/es/CodeInput/CodeInput.js

@@ -76,12 +76,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
               });
@@ -97,10 +95,10 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
                 }
               }, 1000);
 
-            case 8:
+            case 7:
               ;
 
-            case 9:
+            case 8:
             case "end":
               return _context.stop();
           }

package/es/SuperForm2/SuperForm.js

@@ -9,8 +9,9 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
 import _Row from "antd/es/row";
 import _Col from "antd/es/col";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
-import _Checkbox from "antd/es/checkbox";
+import _Tooltip from "antd/es/tooltip";
 import _Icon from "antd/es/icon";
+import _Checkbox from "antd/es/checkbox";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
@@ -30,7 +31,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 
 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 _context23, _context24; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context23 = ownKeys(Object(source), !0)).call(_context23, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context24 = ownKeys(Object(source))).call(_context24, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context24, _context25; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(source), !0)).call(_context24, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context25 = ownKeys(Object(source))).call(_context25, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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); }; }
 
@@ -45,7 +46,7 @@ import variables from '../variables';
 var FormItem = _Form.Item;
 var defaultSize = 'large';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox'];
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
  * title：[必须]，表单元素的标签
@@ -571,6 +572,17 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       return /*#__PURE__*/React.createElement(Control, props);
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "toCheckbox", function (props, control) {
+      var _context21;
+
+      var options = control.options || [];
+      return /*#__PURE__*/React.createElement(_Checkbox.Group, {
+        options: options,
+        onChange: _bindInstanceProperty(_context21 = _this2.onBlur).call(_context21, _assertThisInitialized(_this2), control.key),
+        value: _this2.props.value[control.key]
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this2), "toControl", function (props, control) {
       switch (props.type) {
         case 'readonly':
@@ -626,6 +638,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         case 'cascader':
           return _this2.toCascader(props, control);
 
+        case 'checkbox':
+          return _this2.toCheckbox(props, control);
+
         default:
           return 'type error';
       }
@@ -634,18 +649,26 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_assertThisInitialized(_this2), "toLabel", function (_ref11, type) {
       var title = _ref11.title,
           showAdd = _ref11.showAdd,
-          key = _ref11.key;
+          key = _ref11.key,
+          showInfo = _ref11.showInfo,
+          showInfoTitle = _ref11.showInfoTitle;
 
       if (showAdd && type !== 'readonly') {
-        var _context21;
+        var _context22;
 
-        var onClick = _bindInstanceProperty(_context21 = _this2.onAdd).call(_context21, _assertThisInitialized(_this2), key, title);
+        var onClick = _bindInstanceProperty(_context22 = _this2.onAdd).call(_context22, _assertThisInitialized(_this2), key, title);
 
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
           role: "add",
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showInfo) {
+        return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
+          title: showInfoTitle
+        }, /*#__PURE__*/React.createElement(_Icon, {
+          type: "info-circle"
+        })));
       } else {
         return title;
       }
@@ -701,7 +724,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "toCols", function () {
-      var _context22;
+      var _context23;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -713,7 +736,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context22 = _this2.getControls()).call(_context22, function (control) {
+      return _mapInstanceProperty(_context23 = _this2.getControls()).call(_context23, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/es/SuperTable2/SuperTable2.js

@@ -26,13 +26,13 @@ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 
 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";
@@ -50,18 +50,18 @@ 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';
 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为空字符串时，表头才会显示为复选框
@@ -95,7 +95,8 @@ var ColType = {
  * 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 = {
@@ -107,7 +108,11 @@ var CallbackType = {
   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中提供，可直接引用
+
 };
 /**
  * base[可选]：序号的开始数字，所有回调函数中的序号值都会加上这个值，默认值为0
@@ -199,6 +204,15 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
 
+    _defineProperty(_assertThisInitialized(_this), "onDoubleClick", function (key, value) {
+      return function () {
+        var _ref8 = _this.props.callback || {},
+            onDoubleClick = _ref8.onDoubleClick;
+
+        onDoubleClick && onDoubleClick(key, value);
+      };
+    });
+
     _defineProperty(_assertThisInitialized(_this), "closeValid", function () {
       var _this$props = _this.props,
           valid = _this$props.valid,
@@ -338,8 +352,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var split = index2 === list.length - 1 ? '' : ',';
 
           var onClick = function onClick() {
-            var _ref8 = _this.props.callback || {},
-                onLink = _ref8.onLink;
+            var _ref9 = _this.props.callback || {},
+                onLink = _ref9.onLink;
 
             onLink && onLink(col.key, index, item2);
           };
@@ -353,8 +367,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         var title = typeof col.link === 'string' ? col.link : value;
 
         var onClick = function onClick() {
-          var _ref9 = _this.props.callback || {},
-              onLink = _ref9.onLink;
+          var _ref10 = _this.props.callback || {},
+              onLink = _ref10.onLink;
 
           onLink && onLink(col.key, index, record);
         };
@@ -371,13 +385,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'
@@ -421,12 +438,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)
             });
 
@@ -453,14 +470,41 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
                 height: '80px'
               }
             }) : /*#__PURE__*/React.createElement("div", {
-              role: 'imgBox'
+              role: 'imgBox',
+              style: {
+                maxWidth: '120px'
+              }
             }, /*#__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'
+              }
+            }, 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), {}, {
@@ -509,12 +553,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref10) {
-      var required = _ref10.required,
-          title = _ref10.title,
-          type = _ref10.type,
-          key = _ref10.key,
-          showAdd = _ref10.showAdd;
+    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref11) {
+      var required = _ref11.required,
+          title = _ref11.title,
+          type = _ref11.type,
+          key = _ref11.key,
+          showAdd = _ref11.showAdd;
 
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
@@ -530,9 +574,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref11) {
-      var type = _ref11.type,
-          align = _ref11.align;
+    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref12) {
+      var type = _ref12.type,
+          align = _ref12.align;
 
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
@@ -542,24 +586,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 (_ref12, index) {
-        var col = _extends({}, _ref12);
+      })).call(_context9, function (_ref13, index) {
+        var _context10;
+
+        var col = _extends({}, _ref13);
 
         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 || _includesInstanceProperty(_context10 = ['index', 'checked']).call(_context10, col.key) ? 70 : 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)){
@@ -580,14 +626,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, _ref13) {
-          var _context9;
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref14) {
+          var _context11;
 
-          var key = _ref13.key,
-              type = _ref13.type,
-              options = _ref13.options;
+          var key = _ref14.key,
+              type = _ref14.type,
+              options = _ref14.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);
@@ -621,7 +667,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getProps", function () {
-      var _context10;
+      var _context12;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -640,13 +686,17 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           _this$props3$onExpand = _this$props3.onExpand,
           onExpand = _this$props3$onExpand === void 0 ? undefined : _this$props3$onExpand;
 
-      var widthX = _reduceInstanceProperty(_context10 = _filterInstanceProperty(cols).call(cols, function (col) {
+      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 : 120;
       }, 0);
 
-      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {} : {
+      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {
+        expandedRowRender: expandedRowRender
+      } : {
         scroll: {
           x: widthX,
           y: maxHeight
@@ -666,7 +716,6 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           emptyText: _this.props.emptyText
         } : null
       }, _this.getPropsByCheckbox()), {}, {
-        expandedRowRender: expandedRowRender,
         onExpand: onExpand
       }, scrollProps);
     });

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/es/Title/Title.less

@@ -1,35 +1,35 @@
-@import '../variables';
-
-.@{cloudlink-prefix}-title {
-  > *:first-child {
-    display: inline-block;
-    color: @brand-primary;
-    line-height: 1.2;
-
-    &[data-border='true'] {
-      padding: 0 5px;
-      border-left: @brand-primary solid 3px;
-    }
-
-    &[data-fold='true'] {
-      cursor: pointer;
-      margin: 8px 0;
-    }
-
-    &[data-required='true'] {
-      &::after {
-        display: inline-block;
-        margin-left: 4px;
-        color: #f5222d;
-        font-size: 12px;
-        font-family: SimSun, sans-serif;
-        line-height: 1;
-        content: '*';
-      }
-    }
-  }
-
-  > [role = 'toolbar'] {
-    display: inline-block;
-  }
-}
+@import '../variables';
+
+.@{cloudlink-prefix}-title {
+  > *:first-child {
+    display: inline-block;
+    color: @brand-primary;
+    line-height: 1.2;
+
+    &[data-border='true'] {
+      padding: 0 5px;
+      border-left: @brand-primary solid 3px;
+    }
+
+    &[data-fold='true'] {
+      cursor: pointer;
+      margin: 8px 0;
+    }
+
+    &[data-required='true'] {
+      &::after {
+        display: inline-block;
+        margin-left: 4px;
+        color: #f5222d;
+        font-size: 12px;
+        font-family: SimSun, sans-serif;
+        line-height: 1;
+        content: '*';
+      }
+    }
+  }
+
+  > [role = 'toolbar'] {
+    display: inline-block;
+  }
+}

package/es/Title/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "Title",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./Title.js"
-}
+{
+  "name": "Title",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./Title.js"
+}

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/SuperForm2/SuperForm.js

@@ -50,10 +50,12 @@ var _col = _interopRequireDefault(require("antd/lib/col"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
-var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
+var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
 
 var _icon = _interopRequireDefault(require("antd/lib/icon"));
 
+var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
@@ -90,7 +92,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(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 _context23, _context24; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context23 = ownKeys(Object(source), !0)).call(_context23, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context24 = ownKeys(Object(source))).call(_context24, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context24, _context25; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(source), !0)).call(_context24, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context25 = ownKeys(Object(source))).call(_context25, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
@@ -99,7 +101,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_R
 var FormItem = _form["default"].Item;
 var defaultSize = 'large';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox'];
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
  * title：[必须]，表单元素的标签
@@ -585,6 +587,16 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       props.loadData = _this2.createSearchEvent(control);
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCheckbox", function (props, control) {
+      var _context21;
+
+      var options = control.options || [];
+      return /*#__PURE__*/_react["default"].createElement(_checkbox["default"].Group, {
+        options: options,
+        onChange: (0, _bind["default"])(_context21 = _this2.onBlur).call(_context21, (0, _assertThisInitialized2["default"])(_this2), control.key),
+        value: _this2.props.value[control.key]
+      });
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toControl", function (props, control) {
       switch (props.type) {
         case 'readonly':
@@ -640,6 +652,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         case 'cascader':
           return _this2.toCascader(props, control);
 
+        case 'checkbox':
+          return _this2.toCheckbox(props, control);
+
         default:
           return 'type error';
       }
@@ -647,17 +662,25 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toLabel", function (_ref11, type) {
       var title = _ref11.title,
           showAdd = _ref11.showAdd,
-          key = _ref11.key;
+          key = _ref11.key,
+          showInfo = _ref11.showInfo,
+          showInfoTitle = _ref11.showInfoTitle;
 
       if (showAdd && type !== 'readonly') {
-        var _context21;
+        var _context22;
 
-        var onClick = (0, _bind["default"])(_context21 = _this2.onAdd).call(_context21, (0, _assertThisInitialized2["default"])(_this2), key, title);
+        var onClick = (0, _bind["default"])(_context22 = _this2.onAdd).call(_context22, (0, _assertThisInitialized2["default"])(_this2), key, title);
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           role: "add",
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showInfo) {
+        return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+          title: showInfoTitle
+        }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          type: "info-circle"
+        })));
       } else {
         return title;
       }
@@ -711,7 +734,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCols", function () {
-      var _context22;
+      var _context23;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -723,7 +746,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return (0, _map["default"])(_context22 = _this2.getControls()).call(_context22, function (control) {
+      return (0, _map["default"])(_context23 = _this2.getControls()).call(_context23, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/lib/SuperTable2/SuperTable2.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
+
 var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
 
 var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
@@ -28,6 +30,8 @@ var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-me
 
 var _Array$isArray2 = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
 
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
+
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
 _Object$defineProperty(exports, "__esModule", {
@@ -84,7 +88,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
-var _Control = require("../Control");
+var _Control = _interopRequireWildcard(require("../Control"));
 
 var _SuperTableCell = _interopRequireDefault(require("./SuperTableCell"));
 
@@ -94,17 +98,21 @@ var _SuperToolbar = _interopRequireDefault(require("../SuperToolbar"));
 
 var _variables = _interopRequireDefault(require("../variables"));
 
-var _helper = _interopRequireDefault(require("../helper"));
+var _helper = _interopRequireWildcard(require("../helper"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray2(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 = _filterInstanceProperty2(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) { (0, _defineProperty2["default"])(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) { (0, _defineProperty2["default"])(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; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
@@ -114,8 +122,8 @@ var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select', //
 '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为空字符串时，表头才会显示为复选框
@@ -149,7 +157,8 @@ var ColType = {
  * 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 = {
@@ -161,7 +170,11 @@ var CallbackType = {
   onLink: _propTypes["default"].func,
   onAdd: _propTypes["default"].func,
   onRenderCustom: _propTypes["default"].func,
-  onToolbar: _propTypes["default"].func
+  onToolbar: _propTypes["default"].func,
+  onDoubleClick: _propTypes["default"].func,
+  onTableFileChange: _propTypes["default"].func,
+  buildSuperUploadProps: _propTypes["default"].func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+
 };
 /**
  * base[可选]：序号的开始数字，所有回调函数中的序号值都会加上这个值，默认值为0
@@ -245,6 +258,14 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         onBlur && onBlur(_this.getIndex(rowIndex), key, value);
       };
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDoubleClick", function (key, value) {
+      return function () {
+        var _ref8 = _this.props.callback || {},
+            onDoubleClick = _ref8.onDoubleClick;
+
+        onDoubleClick && onDoubleClick(key, value);
+      };
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "closeValid", function () {
       var _this$props = _this.props,
           valid = _this$props.valid,
@@ -380,8 +401,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var split = index2 === list.length - 1 ? '' : ',';
 
           var onClick = function onClick() {
-            var _ref8 = _this.props.callback || {},
-                onLink = _ref8.onLink;
+            var _ref9 = _this.props.callback || {},
+                onLink = _ref9.onLink;
 
             onLink && onLink(col.key, index, item2);
           };
@@ -395,8 +416,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         var title = typeof col.link === 'string' ? col.link : value;
 
         var onClick = function onClick() {
-          var _ref9 = _this.props.callback || {},
-              onLink = _ref9.onLink;
+          var _ref10 = _this.props.callback || {},
+              onLink = _ref10.onLink;
 
           onLink && onLink(col.key, index, record);
         };
@@ -411,13 +432,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_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["default"].createElement("div", {
+            onDoubleClick: _this.onDoubleClick(col.key, record.key),
             style: {
+              minHeight: '20px',
+              minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
               overflow: 'hidden',
               textOverflow: 'ellipsis'
@@ -461,12 +485,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             }
 
           case 'switch':
-            return value === 'noneDisplay' ? /*#__PURE__*/_react["default"].createElement("div", null) : /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+            return typeof value === 'string' ? /*#__PURE__*/_react["default"].createElement("div", null, value) : /*#__PURE__*/_react["default"].createElement(_switch["default"], {
               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)
             });
 
@@ -493,14 +517,41 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
                 height: '80px'
               }
             }) : /*#__PURE__*/_react["default"].createElement("div", {
-              role: 'imgBox'
+              role: 'imgBox',
+              style: {
+                maxWidth: '120px'
+              }
             }, /*#__PURE__*/_react["default"].createElement("img", {
               src: value.img,
               style: {
                 width: '80px',
                 height: '80px'
               }
-            }), /*#__PURE__*/_react["default"].createElement("span", null, value.title)) : /*#__PURE__*/_react["default"].createElement("div", null);
+            }), /*#__PURE__*/_react["default"].createElement("div", {
+              style: {
+                display: 'inline-block'
+              }
+            }, /*#__PURE__*/_react["default"].createElement("span", {
+              style: {
+                display: 'block'
+              }
+            }, value.title), _helper["default"].isEmpty2(value.remark) ? null : /*#__PURE__*/_react["default"].createElement("span", {
+              style: {
+                color: '#333'
+              }
+            }, value.remark))) : /*#__PURE__*/_react["default"].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 ? (0, _bind["default"])(_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["default"].createElement(_Control["default"], uploadProps);
 
           default:
             return _this.renderEditableCell(_objectSpread(_objectSpread({}, col), {}, {
@@ -546,12 +597,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref10) {
-      var required = _ref10.required,
-          title = _ref10.title,
-          type = _ref10.type,
-          key = _ref10.key,
-          showAdd = _ref10.showAdd;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref11) {
+      var required = _ref11.required,
+          title = _ref11.title,
+          type = _ref11.type,
+          key = _ref11.key,
+          showAdd = _ref11.showAdd;
 
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
@@ -566,9 +617,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         }, title, _this.toAdd(key, showAdd));
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref11) {
-      var type = _ref11.type,
-          align = _ref11.align;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref12) {
+      var type = _ref12.type,
+          align = _ref12.align;
 
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
@@ -577,22 +628,24 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "canReadonly", function (type) {
-      var _context7;
+      var _context8;
 
-      return !(0, _includes["default"])(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
+      return !(0, _includes["default"])(_context8 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context8, type);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols) {
-      var _context8;
+      var _context9;
 
       var readonly = _this.props.readonly;
-      return (0, _map["default"])(_context8 = (0, _filter["default"])(cols).call(cols, function (col) {
+      return (0, _map["default"])(_context9 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context8, function (_ref12, index) {
-        var col = (0, _extends2["default"])({}, _ref12);
+      })).call(_context9, function (_ref13, index) {
+        var _context10;
+
+        var col = (0, _extends2["default"])({}, _ref13);
         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 || (0, _includes["default"])(_context10 = ['index', 'checked']).call(_context10, col.key) ? 70 : 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)){
@@ -612,14 +665,14 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getDataSource", function (items, cols) {
       return (0, _map["default"])(items).call(items, function (item, index) {
-        return (0, _reduce["default"])(cols).call(cols, function (result, _ref13) {
-          var _context9;
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref14) {
+          var _context11;
 
-          var key = _ref13.key,
-              type = _ref13.type,
-              options = _ref13.options;
+          var key = _ref14.key,
+              type = _ref14.type,
+              options = _ref14.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context9 = item.isReadonly).call(_context9, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context11 = item.isReadonly).call(_context11, key))) {
             result[key] = item[key];
           } else {
             result[key] = (0, _Control.getTitle)(item[key], options);
@@ -651,7 +704,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getProps", function () {
-      var _context10;
+      var _context12;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -669,12 +722,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           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;
-      var widthX = (0, _reduce["default"])(_context10 = (0, _filter["default"])(cols).call(cols, function (col) {
+      var widthX = (0, _reduce["default"])(_context12 = (0, _filter["default"])(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 : (0, _includes["default"])(_context13 = ['index', 'checked']).call(_context13, item.key) ? 70 : 120;
       }, 0);
-      var scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {} : {
+      var scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {
+        expandedRowRender: expandedRowRender
+      } : {
         scroll: {
           x: widthX,
           y: maxHeight
@@ -694,7 +751,6 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           emptyText: _this.props.emptyText
         } : null
       }, _this.getPropsByCheckbox()), {}, {
-        expandedRowRender: expandedRowRender,
         onExpand: onExpand
       }, scrollProps);
     });

package/lib/SuperUpload/SuperUpload.js

@@ -66,7 +66,7 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-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 = {
@@ -79,7 +79,7 @@ var propTypes = {
   required: _propTypes["default"].bool,
   //是否必须上传,默认false
   listType: _propTypes["default"].oneOf[('text', 'picture', 'picture-card')],
-  //上传列表的内建样式，支持三种,默认text
+  //上传列表的内建样式，支持三种,默认picture-card
   readonly: _propTypes["default"].bool,
   //所在页面是否只读,默认false
   multiple: _propTypes["default"].bool,

package/lib/Title/Title.less

@@ -1,35 +1,35 @@
-@import '../variables';
-
-.@{cloudlink-prefix}-title {
-  > *:first-child {
-    display: inline-block;
-    color: @brand-primary;
-    line-height: 1.2;
-
-    &[data-border='true'] {
-      padding: 0 5px;
-      border-left: @brand-primary solid 3px;
-    }
-
-    &[data-fold='true'] {
-      cursor: pointer;
-      margin: 8px 0;
-    }
-
-    &[data-required='true'] {
-      &::after {
-        display: inline-block;
-        margin-left: 4px;
-        color: #f5222d;
-        font-size: 12px;
-        font-family: SimSun, sans-serif;
-        line-height: 1;
-        content: '*';
-      }
-    }
-  }
-
-  > [role = 'toolbar'] {
-    display: inline-block;
-  }
-}
+@import '../variables';
+
+.@{cloudlink-prefix}-title {
+  > *:first-child {
+    display: inline-block;
+    color: @brand-primary;
+    line-height: 1.2;
+
+    &[data-border='true'] {
+      padding: 0 5px;
+      border-left: @brand-primary solid 3px;
+    }
+
+    &[data-fold='true'] {
+      cursor: pointer;
+      margin: 8px 0;
+    }
+
+    &[data-required='true'] {
+      &::after {
+        display: inline-block;
+        margin-left: 4px;
+        color: #f5222d;
+        font-size: 12px;
+        font-family: SimSun, sans-serif;
+        line-height: 1;
+        content: '*';
+      }
+    }
+  }
+
+  > [role = 'toolbar'] {
+    display: inline-block;
+  }
+}

package/lib/Title/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "Title",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./Title.js"
-}
+{
+  "name": "Title",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./Title.js"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-b2b",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "A react component library dependent antd",
   "keywords": [
     "react",