linkmore-design 1.1.28-alpha.7 → 1.1.28-alpha.8

package/dist/index.umd.js

@@ -313372,7 +313372,7 @@
     return isExpandRow(children) ? children === null || children === void 0 ? void 0 : (_children$3 = children[0]) === null || _children$3 === void 0 ? void 0 : (_children$3$props = _children$3.props) === null || _children$3$props === void 0 ? void 0 : (_children$3$props$chi = _children$3$props.children) === null || _children$3$props$chi === void 0 ? void 0 : (_children$3$props$chi2 = _children$3$props$chi[1]) === null || _children$3$props$chi2 === void 0 ? void 0 : (_children$3$props$chi3 = _children$3$props$chi2.props) === null || _children$3$props$chi3 === void 0 ? void 0 : _children$3$props$chi3['aria-label'] : '';
   }
   function checkMemoShouldUploadSpecialFun(prev, next) {
-    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro2, _nextCol$componentPro2, _prevCol$componentPro3, _nextCol$componentPro3, _prevCol$componentPro4, _nextCol$componentPro4, _prevCol$componentPro5, _nextCol$componentPro5, _next$className, _prevCol$componentPro6, _nextCol$componentPro6;
+    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro2, _nextCol$componentPro2, _prevCol$componentPro3, _nextCol$componentPro3, _prevCol$componentPro4, _nextCol$componentPro4, _prevCol$componentPro5, _nextCol$componentPro5, _next$className, _next$className2, _prevCol$componentPro6, _nextCol$componentPro6;
 
     var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -313430,6 +313430,10 @@
       return false;
     }
 
+    if (((_next$className2 = next.className) === null || _next$className2 === void 0 ? void 0 : _next$className2.indexOf('ant-table-cell-with-append')) > -1) {
+      return false;
+    }
+
     if (next.className.indexOf('ant-table-selection-column') > -1) {
       var _prev$children, _prev$children$, _next$children, _next$children$;
 
@@ -314279,7 +314283,7 @@
           onClick: toggleEdit
         }, childNode);
       } else if (isEdit && editable) {
-        childNode = /*#__PURE__*/React__default['default'].createElement("div", {
+        childNode = isExpandRow(childNode) ? /*#__PURE__*/React__default['default'].createElement("div", {
           style: {
             display: 'flex',
             flexDirection: 'row',
@@ -314294,10 +314298,19 @@
           noStyle: formProps ? false : true
         }, formProps), {}, {
           name: dataIndex
-        }), Control(editable)));
+        }), Control(editable))) : /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
+          errorPlacement: "right",
+          valuePropName: editable === 'switch' ? 'checked' : 'value',
+          style: {
+            margin: 0
+          },
+          noStyle: formProps ? false : true
+        }, formProps), {}, {
+          name: dataIndex
+        }), Control(editable));
 
         if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
-          childNode = /*#__PURE__*/React__default['default'].createElement("div", {
+          childNode = isExpandRow(childNode) ? /*#__PURE__*/React__default['default'].createElement("div", {
             style: {
               display: 'flex',
               flexDirection: 'row',
@@ -314311,7 +314324,15 @@
           }, formProps), {}, {
             noStyle: formProps ? false : true,
             name: [dataIndex, 'value']
-          }), Control(editable)));
+          }), Control(editable))) : /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
+            errorPlacement: "right",
+            style: {
+              margin: 0
+            }
+          }, formProps), {}, {
+            noStyle: formProps ? false : true,
+            name: [dataIndex, 'value']
+          }), Control(editable));
         }
       } else if (!isEdit && (componentProps === null || componentProps === void 0 ? void 0 : componentProps.options)) {
         var _componentProps$optio, _componentProps$optio2;
@@ -314848,6 +314869,7 @@
         maxWidth: 48,
         className: 'drag-visible',
         fixed: 'left',
+        order: -2,
         render: function render(_, record) {
           return /*#__PURE__*/React__default['default'].createElement(Dragger$1, {
             id: (record === null || record === void 0 ? void 0 : record[_rowKey]) || (record === null || record === void 0 ? void 0 : record.id)
@@ -314860,6 +314882,7 @@
         maxWidth: 48,
         ellipsis: true,
         fixed: 'left',
+        order: -1,
         render: function render(_, record, index) {
           var _deepDataSourceRef$cu9, _deepDataSourceRef$cu10, _deepDataSourceRef$cu11;
 
@@ -314871,6 +314894,7 @@
         width: 48,
         ellipsis: true,
         maxWidth: 48,
+        order: -1,
         fixed: 'left'
       }, indexCol || {}), {}, {
         render: function render(_, record, index) {
@@ -314908,7 +314932,7 @@
       var mainColumns = [];
       var rightColumns = [];
       (_localColumns2 = localColumns) === null || _localColumns2 === void 0 ? void 0 : _localColumns2.forEach(function (item) {
-        if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
+        if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left' || (item === null || item === void 0 ? void 0 : item.fixed) === true) {
           leftColumns.push(item);
         } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
           rightColumns.push(item);
@@ -315107,6 +315131,11 @@
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
+                    if (!virtual) {
+                      _context4.next = 17;
+                      break;
+                    }
+
                     fullNum = 0;
                     flag = true;
                     messageIndex = null;
@@ -315183,18 +315212,18 @@
                       };
                     }();
 
-                    _context4.next = 8;
+                    _context4.next = 9;
                     return deepValidator(dataSource, null);
 
-                  case 8:
+                  case 9:
                     if (!flag) {
-                      _context4.next = 12;
+                      _context4.next = 13;
                       break;
                     }
 
                     return _context4.abrupt("return", Promise.resolve(dataSource));
 
-                  case 12:
+                  case 13:
                     setTimeout(function () {
                       if (messageIndex !== null) {
                         var _scrollToIndexRef$cur;
@@ -315261,7 +315290,18 @@
                     }, 100);
                     return _context4.abrupt("return", Promise.reject(errorInfo));
 
-                  case 14:
+                  case 15:
+                    _context4.next = 18;
+                    break;
+
+                  case 17:
+                    return _context4.abrupt("return", Promise.all(Object.values(allFormListRef.current || []).map(function (item) {
+                      var _item$form;
+
+                      return item === null || item === void 0 ? void 0 : (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.validateFields();
+                    })));
+
+                  case 18:
                   case "end":
                     return _context4.stop();
                 }
@@ -315421,6 +315461,19 @@
         rowClassName: "editable-row",
         bordered: true,
         pagination: false,
+        expandable: _objectSpread({
+          expandedRowKeys: expandedRowKeys,
+          fixed: true,
+          indentSize: 0,
+          expandIconColumnIndex: checkExpandIconColumnIndex({
+            rowSelection: rowSelection,
+            sortOpen: sortOpen,
+            indexCol: indexCol
+          }) || 0,
+          onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
+            return setExpandedRowKeys(expandedRows);
+          }
+        }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
         rowSelection: !rowSelection ? undefined : _objectSpread(_objectSpread({
           fixed: true,
           type: 'checkbox',
@@ -315468,10 +315521,10 @@
       } : undefined,
       pagination: false,
       // components={tableComponents}
-      expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
+      expandable: _objectSpread({
         expandedRowKeys: expandedRowKeys,
         fixed: true,
-        // indentSize: 0,
+        indentSize: 0,
         expandIconColumnIndex: checkExpandIconColumnIndex({
           rowSelection: rowSelection,
           sortOpen: sortOpen,
@@ -315480,7 +315533,7 @@
         onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
           return setExpandedRowKeys(expandedRows);
         }
-      },
+      }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable),
       rowSelection: !rowSelection ? undefined : _objectSpread(_objectSpread({
         fixed: true,
         type: 'checkbox',