tntd 3.0.0-beta.19 → 3.0.0-beta.20

package/es/array-input/index.js

@@ -13,17 +13,19 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 import React, { isValidElement, useCallback, useEffect, useState } from 'react';
-import { deleteIcon, plusIcon } from './icon';
+import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 import Col from '../col';
 import Row from '../row';
 import Table from '../table';
 import Tooltip from '../tooltip';
+import Icon from '../icon';
+import Button from '../button';
 import './index.less';
 const {
   Column
 } = Table;
 const getWidth = span => 1000 / span;
-export default function ArrayInput({
+function ArrayInput({
   children,
   defaultValue,
   value,
@@ -33,11 +35,17 @@ export default function ArrayInput({
   require = false,
   deleteTip = '',
   plusTip = '',
-  addText = '添加'
+  addText,
+  locale,
+  xProps = {},
+  renderAction
 }) {
   if (!_isFunction(children)) {
     throw new Error('ArrayInput的children必须是函数');
   }
+  if (addText === undefined) {
+    addText = locale === null || locale === void 0 ? void 0 : locale.add;
+  }
   const [_value, setValue] = useState(value || defaultValue);
   useEffect(() => {
     setValue(value);
@@ -79,6 +87,7 @@ export default function ArrayInput({
       if (!_isArray(fields)) {
         fields = _get(fields, 'props.children', []);
       }
+      const actionSpan = 24 - _sum(fields.map(f => _get(f, 'props.span', 4))) % 24;
       return React.createElement(Row, {
         gutter: gutter,
         key: index,
@@ -109,29 +118,26 @@ export default function ArrayInput({
           }
         }, other)));
       }), React.createElement(Col, {
-        span: 24 - _sum(fields.map(f => _get(f, 'props.span', 4))) % 24
+        span: actionSpan
       }, React.createElement("span", {
         className: "tntd-array-input-action"
-      }, plusTip ? React.createElement(Tooltip, {
-        title: plusTip,
-        placement: "left"
-      }, React.createElement("span", {
-        className: "mr10",
-        onClick: () => onAdd(index)
-      }, plusIcon)) : React.createElement("span", {
-        className: "mr10",
-        onClick: () => onAdd(index)
-      }, plusIcon), deleteTip ? React.createElement(Tooltip, {
-        title: deleteTip,
-        placement: "right"
+      }, renderAction ? renderAction(item, index, onDelete, onAdd) : React.createElement(React.Fragment, null, deleteTip ? React.createElement(Tooltip, {
+        title: deleteTip
       }, React.createElement("span", {
         onClick: () => onDelete(index)
-      }, deleteIcon)) : React.createElement("span", {
+      }, React.createElement(Icon, {
+        type: "delete"
+      }))) : React.createElement("span", {
         onClick: () => onDelete(index)
-      }, deleteIcon))));
-    }), inValue.length === 0 && React.createElement("a", {
+      }, React.createElement(Icon, {
+        type: "delete"
+      }))))));
+    }), React.createElement(Button, {
+      type: "link",
       onClick: () => onAdd()
-    }, addText));
+    }, React.createElement(Icon, {
+      type: "plus"
+    }), addText));
   } else {
     let fields = children({}, 0);
     if (!_isArray(fields)) {
@@ -149,15 +155,11 @@ export default function ArrayInput({
     });
     return React.createElement("div", {
       className: "tntd-array-input"
-    }, React.createElement(Table, {
+    }, React.createElement(Table, Object.assign({
       dataSource: dataSource,
       pagination: false,
-      locale: {
-        emptyText: React.createElement("a", {
-          onClick: () => onAdd()
-        }, addText)
-      }
-    }, fields.map(field => {
+      bordered: true
+    }, xProps), fields.map(field => {
       const {
         name,
         span,
@@ -191,26 +193,39 @@ export default function ArrayInput({
       title: "\u64CD\u4F5C",
       width: getWidth(24 - _sumBy(fields, 'props.span') % 24),
       render: (text, row, index) => {
+        if (renderAction) {
+          return renderAction(row, index, onDelete, onAdd);
+        }
         return React.createElement("span", {
           className: "tntd-array-input-action"
-        }, plusTip ? React.createElement(Tooltip, {
-          title: plusTip,
-          placement: "left"
-        }, React.createElement("span", {
-          className: "mr10",
-          onClick: () => onAdd(index)
-        }, plusIcon)) : React.createElement("span", {
-          className: "mr10",
-          onClick: () => onAdd(index)
-        }, plusIcon), deleteTip ? React.createElement(Tooltip, {
-          title: deleteTip,
-          placement: "right"
+        }, deleteTip ? React.createElement(Tooltip, {
+          title: deleteTip
         }, React.createElement("span", {
           onClick: () => onDelete(index)
-        }, deleteIcon)) : React.createElement("span", {
+        }, React.createElement(Icon, {
+          type: "delete"
+        }))) : React.createElement("span", {
           onClick: () => onDelete(index)
-        }, deleteIcon));
+        }, React.createElement(Icon, {
+          type: "delete"
+        })));
       }
-    })));
+    })), React.createElement(Button, {
+      type: "dashed",
+      block: true,
+      className: "mt10",
+      onClick: () => onAdd()
+    }, React.createElement(Icon, {
+      type: "plus"
+    }), addText));
   }
+}
+export default function WarpArrayInput(props) {
+  return React.createElement(LocaleReceiver, {
+    componentName: "ArrayInput"
+  }, locale => {
+    return React.createElement(ArrayInput, Object.assign({}, props, {
+      locale: locale
+    }));
+  });
 }

package/es/array-input/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/array-input/index.js"],"names":[],"mappings":"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","sourcesContent":["import { get, isArray, isFunction, set, sum, sumBy } from 'lodash'\nimport React, { isValidElement, useCallback, useEffect, useState } from 'react'\nimport { deleteIcon, plusIcon } from './icon'\n\nimport Col from '../col'\nimport Row from '../row'\nimport Table from '../table'\nimport Tooltip from '../tooltip'\n\nimport './index.less'\n\nconst { Column } = Table\nconst getWidth = (span) => 1000 / span\n\nexport default function ArrayInput({\n  children,\n  defaultValue,\n  value,\n  onChange,\n  mode = 'list',\n  gutter = 10,\n  require = false,\n  deleteTip = '',\n  plusTip = '',\n  addText = '添加',\n}) {\n  if (!isFunction(children)) {\n    throw new Error('ArrayInput的children必须是函数')\n  }\n\n  const [_value, setValue] = useState(value || defaultValue)\n\n  useEffect(() => {\n    setValue(value)\n  }, [value])\n\n  const _onChange = useCallback((value) => {\n    if (onChange) {\n      onChange(value)\n    } else {\n      setValue(value)\n    }\n  }, [])\n\n  let inValue = _value || []\n  if (require && inValue.length === 0) {\n    inValue = [{}]\n  }\n\n  const changeValue = (index, name, value) => {\n    inValue[index] = {\n      ...inValue[index],\n      [name]: value,\n    }\n    _onChange([...inValue])\n  }\n\n  const onAdd = (index) => {\n    if (index === undefined) {\n      _onChange([...inValue, {}])\n    } else {\n      inValue.splice(index + 1, 0, {})\n      _onChange([...inValue])\n    }\n  }\n\n  const onDelete = (i) => {\n    inValue.splice(i, 1)\n    _onChange([...inValue])\n  }\n\n  if (mode === 'list') {\n    return (\n      <div className=\"tntd-array-input\">\n        {inValue.map((item, index) => {\n          let fields = children(item, index)\n          if (!isArray(fields)) {\n            fields = get(fields, 'props.children', [])\n          }\n          return (\n            <Row gutter={gutter} key={index} className=\"tntd-array-input-item\">\n              {fields.map((field, i) => {\n                if (!isValidElement(field)) {\n                  return field ? (\n                    <Col span={4} key={i}>\n                      {field}\n                    </Col>\n                  ) : (\n                    ''\n                  )\n                }\n                const { name, span = 4, onChange: fieldChange, ...other } = field?.props\n                return (\n                  <Col span={span} key={i}>\n                    {React.cloneElement(field, {\n                      value: item[name] || undefined,\n                      onChange: (e) => {\n                        fieldChange && fieldChange(e, index, changeValue)\n                        const newValue = e.target ? e.target.value : e\n                        changeValue(index, name, newValue)\n                      },\n                      ...other,\n                    })}\n                  </Col>\n                )\n              })}\n              <Col span={24 - (sum(fields.map((f) => get(f, 'props.span', 4))) % 24)}>\n                <span className=\"tntd-array-input-action\">\n                  {plusTip ? (\n                    <Tooltip title={plusTip} placement=\"left\">\n                      <span className=\"mr10\" onClick={() => onAdd(index)}>\n                        {plusIcon}\n                      </span>\n                    </Tooltip>\n                  ) : (\n                    <span className=\"mr10\" onClick={() => onAdd(index)}>\n                      {plusIcon}\n                    </span>\n                  )}\n                  {deleteTip ? (\n                    <Tooltip title={deleteTip} placement=\"right\">\n                      <span onClick={() => onDelete(index)}>{deleteIcon}</span>\n                    </Tooltip>\n                  ) : (\n                    <span onClick={() => onDelete(index)}>{deleteIcon}</span>\n                  )}\n                </span>\n              </Col>\n            </Row>\n          )\n        })}\n        {inValue.length === 0 && <a onClick={() => onAdd()}>{addText}</a>}\n      </div>\n    )\n  } else {\n    let fields = children({}, 0)\n    if (!isArray(fields)) {\n      fields = get(fields, 'props.children', [])\n    }\n    const dataSource = inValue.map((value, index) => {\n      const fields = children(value, index)\n      const back = {}\n      fields.forEach((field) => {\n        const name = field?.props?.name\n        name && set(back, name, field)\n      })\n      return back\n    })\n    return (\n      <div className=\"tntd-array-input\">\n        <Table\n          dataSource={dataSource}\n          pagination={false}\n          locale={{\n            emptyText: <a onClick={() => onAdd()}>{addText}</a>,\n          }}\n        >\n          {fields.map((field) => {\n            const { name, span, title } = field?.props || {}\n            return (\n              <Column\n                key={name}\n                dataIndex={name}\n                title={title}\n                width={getWidth(span || 24 / (fields.length + 1))}\n                render={(field, row, index) => {\n                  if (!isValidElement(field)) {\n                    return field\n                  }\n                  const { onChange: fieldChange } = field.props\n                  return React.cloneElement(field, {\n                    value: inValue[index][name] || undefined,\n                    onChange: (e) => {\n                      fieldChange && fieldChange(e, index, changeValue)\n                      const newValue = e.target ? e.target.value : e\n                      changeValue(index, name, newValue)\n                    },\n                  })\n                }}\n              ></Column>\n            )\n          })}\n          <Column\n            key=\"action\"\n            dataIndex=\"action\"\n            title=\"操作\"\n            width={getWidth(24 - (sumBy(fields, 'props.span') % 24))}\n            render={(text, row, index) => {\n              return (\n                <span className=\"tntd-array-input-action\">\n                  {plusTip ? (\n                    <Tooltip title={plusTip} placement=\"left\">\n                      <span className=\"mr10\" onClick={() => onAdd(index)}>\n                        {plusIcon}\n                      </span>\n                    </Tooltip>\n                  ) : (\n                    <span className=\"mr10\" onClick={() => onAdd(index)}>\n                      {plusIcon}\n                    </span>\n                  )}\n                  {deleteTip ? (\n                    <Tooltip title={deleteTip} placement=\"right\">\n                      <span onClick={() => onDelete(index)}>{deleteIcon}</span>\n                    </Tooltip>\n                  ) : (\n                    <span onClick={() => onDelete(index)}>{deleteIcon}</span>\n                  )}\n                </span>\n              )\n            }}\n          ></Column>\n        </Table>\n      </div>\n    )\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/array-input/index.js"],"names":[],"mappings":"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","sourcesContent":["import { get, isArray, isFunction, set, sum, sumBy } from 'lodash'\nimport React, { isValidElement, useCallback, useEffect, useState } from 'react'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport Col from '../col'\nimport Row from '../row'\nimport Table from '../table'\nimport Tooltip from '../tooltip'\nimport Icon from '../icon'\nimport Button from '../button'\n\nimport './index.less'\n\nconst { Column } = Table\nconst getWidth = (span) => 1000 / span\n\nfunction ArrayInput({\n  children,\n  defaultValue,\n  value,\n  onChange,\n  mode = 'list',\n  gutter = 10,\n  require = false,\n  deleteTip = '',\n  plusTip = '',\n  addText,\n  locale,\n  xProps = {},\n  renderAction,\n}) {\n  if (!isFunction(children)) {\n    throw new Error('ArrayInput的children必须是函数')\n  }\n  if (addText === undefined) {\n    addText = locale?.add\n  }\n\n  const [_value, setValue] = useState(value || defaultValue)\n\n  useEffect(() => {\n    setValue(value)\n  }, [value])\n\n  const _onChange = useCallback((value) => {\n    if (onChange) {\n      onChange(value)\n    } else {\n      setValue(value)\n    }\n  }, [])\n\n  let inValue = _value || []\n  if (require && inValue.length === 0) {\n    inValue = [{}]\n  }\n\n  const changeValue = (index, name, value) => {\n    inValue[index] = {\n      ...inValue[index],\n      [name]: value,\n    }\n    _onChange([...inValue])\n  }\n\n  const onAdd = (index) => {\n    if (index === undefined) {\n      _onChange([...inValue, {}])\n    } else {\n      inValue.splice(index + 1, 0, {})\n      _onChange([...inValue])\n    }\n  }\n\n  const onDelete = (i) => {\n    inValue.splice(i, 1)\n    _onChange([...inValue])\n  }\n\n  if (mode === 'list') {\n    return (\n      <div className=\"tntd-array-input\">\n        {inValue.map((item, index) => {\n          let fields = children(item, index)\n          if (!isArray(fields)) {\n            fields = get(fields, 'props.children', [])\n          }\n          const actionSpan = 24 - (sum(fields.map((f) => get(f, 'props.span', 4))) % 24)\n          return (\n            <Row gutter={gutter} key={index} className=\"tntd-array-input-item\">\n              {fields.map((field, i) => {\n                if (!isValidElement(field)) {\n                  return field ? (\n                    <Col span={4} key={i}>\n                      {field}\n                    </Col>\n                  ) : (\n                    ''\n                  )\n                }\n                const { name, span = 4, onChange: fieldChange, ...other } = field?.props\n                return (\n                  <Col span={span} key={i}>\n                    {React.cloneElement(field, {\n                      value: item[name] || undefined,\n                      onChange: (e) => {\n                        fieldChange && fieldChange(e, index, changeValue)\n                        const newValue = e.target ? e.target.value : e\n                        changeValue(index, name, newValue)\n                      },\n                      ...other,\n                    })}\n                  </Col>\n                )\n              })}\n              <Col span={actionSpan}>\n                <span className=\"tntd-array-input-action\">\n                  {renderAction ? (\n                    renderAction(item, index, onDelete, onAdd)\n                  ) : (\n                    <>\n                      {deleteTip ? (\n                        <Tooltip title={deleteTip}>\n                          <span onClick={() => onDelete(index)}>\n                            <Icon type=\"delete\" />\n                          </span>\n                        </Tooltip>\n                      ) : (\n                        <span onClick={() => onDelete(index)}>\n                          <Icon type=\"delete\" />\n                        </span>\n                      )}\n                    </>\n                  )}\n                </span>\n              </Col>\n            </Row>\n          )\n        })}\n        <Button type=\"link\" onClick={() => onAdd()}>\n          <Icon type=\"plus\" />\n          {addText}\n        </Button>\n      </div>\n    )\n  } else {\n    let fields = children({}, 0)\n    if (!isArray(fields)) {\n      fields = get(fields, 'props.children', [])\n    }\n    const dataSource = inValue.map((value, index) => {\n      const fields = children(value, index)\n      const back = {}\n      fields.forEach((field) => {\n        const name = field?.props?.name\n        name && set(back, name, field)\n      })\n      return back\n    })\n    return (\n      <div className=\"tntd-array-input\">\n        <Table dataSource={dataSource} pagination={false} bordered {...xProps}>\n          {fields.map((field) => {\n            const { name, span, title } = field?.props || {}\n            return (\n              <Column\n                key={name}\n                dataIndex={name}\n                title={title}\n                width={getWidth(span || 24 / (fields.length + 1))}\n                render={(field, row, index) => {\n                  if (!isValidElement(field)) {\n                    return field\n                  }\n                  const { onChange: fieldChange } = field.props\n                  return React.cloneElement(field, {\n                    value: inValue[index][name] || undefined,\n                    onChange: (e) => {\n                      fieldChange && fieldChange(e, index, changeValue)\n                      const newValue = e.target ? e.target.value : e\n                      changeValue(index, name, newValue)\n                    },\n                  })\n                }}\n              ></Column>\n            )\n          })}\n          <Column\n            key=\"action\"\n            dataIndex=\"action\"\n            title=\"操作\"\n            width={getWidth(24 - (sumBy(fields, 'props.span') % 24))}\n            render={(text, row, index) => {\n              if (renderAction) {\n                return renderAction(row, index, onDelete, onAdd)\n              }\n              return (\n                <span className=\"tntd-array-input-action\">\n                  {deleteTip ? (\n                    <Tooltip title={deleteTip}>\n                      <span onClick={() => onDelete(index)}>\n                        <Icon type=\"delete\" />\n                      </span>\n                    </Tooltip>\n                  ) : (\n                    <span onClick={() => onDelete(index)}>\n                      <Icon type=\"delete\" />\n                    </span>\n                  )}\n                </span>\n              )\n            }}\n          ></Column>\n        </Table>\n        <Button type=\"dashed\" block className=\"mt10\" onClick={() => onAdd()}>\n          <Icon type=\"plus\" />\n          {addText}\n        </Button>\n      </div>\n    )\n  }\n}\n\nexport default function WarpArrayInput(props) {\n  return (\n    <LocaleReceiver componentName=\"ArrayInput\">\n      {(locale) => {\n        return <ArrayInput {...props} locale={locale} />\n      }}\n    </LocaleReceiver>\n  )\n}\n"]}

package/es/array-input/index.less

@@ -11,8 +11,11 @@
   .mr10 {
     margin-right: 10px;
   }
+  .mt10 {
+    margin-top: 10px;
+  }
   &-action {
-    line-height: 28px;
+    line-height: @btn-height-base;
     > span {
       cursor: pointer;
     }

package/es/locale/en_US.js

@@ -61,6 +61,9 @@ const en_US = _merge(sourceLocale, {
   Drawer: {
     okText: 'Submit',
     cancelText: 'Cancel'
+  },
+  ArrayInput: {
+    add: 'Add'
   }
 });
 export default en_US;

package/es/locale/en_US.js.map

@@ -1 +1 @@
-{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,YAAY;QAChC,gBAAgB,EAAE,SAAS;QAC3B,KAAK,EAAE,4BAA4B;KACpC;IACD,KAAK,EAAE;QACL,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,eAAe;QAC7B,mBAAmB,EAAE,sBAAsB;QAC3C,cAAc,EAAE,iBAAiB;QACjC,SAAS,EAAE,uBAAuB;QAClC,MAAM,EAAE,SAAS;KAClB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE;YACJ,UAAU,EAAE,aAAa;YACzB,EAAE,EAAE,IAAI;YACR,UAAU,EAAE,aAAa;SAC1B;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;KACb;IACD,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,yCAAyC;KACjD;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,SAAS;KAClB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,SAAS;KAClB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,YAAY;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,MAAM;KACb;IACD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,0BAA0B;QACvC,GAAG,EAAE,KAAK;QACV,EAAE,EAAE,IAAI;QACR,SAAS,EAAE,gBAAgB;QAC3B,SAAS,EAAE,sBAAsB;KAClC;IACD,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,QAAQ;KACrB;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2023-11-01 17:14:46\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2023-11-03 17:02:30\n * @FilePath: /tntd/packages/tntd/src/locale/en_US.ts\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport sourceLocale from 'antd/es/locale/en_US'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst en_US = merge(sourceLocale, {\n  Table: {\n    loadingDescription: 'loading...',\n    emptyDescription: 'No data',\n    total: 'Totally ${total} Record(s)',\n  },\n  Empty: {\n    noGraphData: 'No data',\n    noPermission: 'No permission',\n    createdSuccessfully: 'Created successfully',\n    creationFailed: 'Creation failed',\n    noNetwork: 'Network not connected',\n    noData: 'No data',\n  },\n  Calendar: {\n    lang: {\n      timeSelect: 'Select time',\n      ok: 'OK',\n      dateSelect: 'Select date',\n    },\n  },\n  Handle: {\n    more: 'More',\n  },\n  Exception: {\n    '403': \"Sorry, we don't have access to this page\",\n    '404': 'Sorry, there are no results on this page',\n    '500': \"I'm sorry, the server reported an error\",\n  },\n  TntdCascader: {\n    noData: 'No data',\n  },\n  TntdSelect: {\n    noData: 'No data',\n  },\n  PageLoading: {\n    text: 'loading...',\n  },\n  TntdSecondPage: {\n    back: 'Back',\n  },\n  ColorPicker: {},\n  QueryForm: {\n    placeholder: 'Attribute type filtering',\n    yes: 'Yes',\n    no: 'No',\n    propTitle: 'Attribute type',\n    propValue: 'Attribute type value',\n  },\n  Drawer: {\n    okText: 'Submit',\n    cancelText: 'Cancel',\n  },\n})\n\nexport default en_US\n"]}
+{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,YAAY;QAChC,gBAAgB,EAAE,SAAS;QAC3B,KAAK,EAAE,4BAA4B;KACpC;IACD,KAAK,EAAE;QACL,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,eAAe;QAC7B,mBAAmB,EAAE,sBAAsB;QAC3C,cAAc,EAAE,iBAAiB;QACjC,SAAS,EAAE,uBAAuB;QAClC,MAAM,EAAE,SAAS;KAClB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE;YACJ,UAAU,EAAE,aAAa;YACzB,EAAE,EAAE,IAAI;YACR,UAAU,EAAE,aAAa;SAC1B;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;KACb;IACD,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,yCAAyC;KACjD;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,SAAS;KAClB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,SAAS;KAClB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,YAAY;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,MAAM;KACb;IACD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,0BAA0B;QACvC,GAAG,EAAE,KAAK;QACV,EAAE,EAAE,IAAI;QACR,SAAS,EAAE,gBAAgB;QAC3B,SAAS,EAAE,sBAAsB;KAClC;IACD,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,QAAQ;KACrB;IACD,UAAU,EAAE;QACV,GAAG,EAAE,KAAK;KACX;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2023-11-01 17:14:46\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2023-11-03 17:02:30\n * @FilePath: /tntd/packages/tntd/src/locale/en_US.ts\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport sourceLocale from 'antd/es/locale/en_US'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst en_US = merge(sourceLocale, {\n  Table: {\n    loadingDescription: 'loading...',\n    emptyDescription: 'No data',\n    total: 'Totally ${total} Record(s)',\n  },\n  Empty: {\n    noGraphData: 'No data',\n    noPermission: 'No permission',\n    createdSuccessfully: 'Created successfully',\n    creationFailed: 'Creation failed',\n    noNetwork: 'Network not connected',\n    noData: 'No data',\n  },\n  Calendar: {\n    lang: {\n      timeSelect: 'Select time',\n      ok: 'OK',\n      dateSelect: 'Select date',\n    },\n  },\n  Handle: {\n    more: 'More',\n  },\n  Exception: {\n    '403': \"Sorry, we don't have access to this page\",\n    '404': 'Sorry, there are no results on this page',\n    '500': \"I'm sorry, the server reported an error\",\n  },\n  TntdCascader: {\n    noData: 'No data',\n  },\n  TntdSelect: {\n    noData: 'No data',\n  },\n  PageLoading: {\n    text: 'loading...',\n  },\n  TntdSecondPage: {\n    back: 'Back',\n  },\n  ColorPicker: {},\n  QueryForm: {\n    placeholder: 'Attribute type filtering',\n    yes: 'Yes',\n    no: 'No',\n    propTitle: 'Attribute type',\n    propValue: 'Attribute type value',\n  },\n  Drawer: {\n    okText: 'Submit',\n    cancelText: 'Cancel',\n  },\n  ArrayInput: {\n    add: 'Add',\n  },\n})\n\nexport default en_US\n"]}

package/es/locale/zh_CN.js

@@ -46,6 +46,9 @@ const zh_CN = _merge(sourceLocale, {
   Drawer: {
     okText: '确定',
     cancelText: '取消'
+  },
+  ArrayInput: {
+    add: '添加'
   }
 });
 export default zh_CN;

package/es/locale/zh_CN.js.map

@@ -1 +1 @@
-{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,UAAU;QAC9B,gBAAgB,EAAE,MAAM;QACxB,KAAK,EAAE,gBAAgB;KACxB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,mBAAmB,EAAE,MAAM;QAC3B,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,MAAM;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI;KACX;IACD,SAAS,EAAE;QACT,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,WAAW;KACnB;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM;KACf;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,MAAM,EAAE,MAAM;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,IAAI;KACX;IACD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,QAAQ;QACrB,GAAG,EAAE,GAAG;QACR,EAAE,EAAE,GAAG;QACP,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,OAAO;KACnB;IACD,MAAM,EAAE;QACN,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;KACjB;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["import sourceLocale from 'antd/es/locale/zh_CN'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst zh_CN = merge(sourceLocale, {\n  Table: {\n    loadingDescription: '数据加载中...',\n    emptyDescription: '暂无数据',\n    total: '共 ${total} 条记录',\n  },\n  Empty: {\n    noGraphData: '暂无图表',\n    noPermission: '暂无权限',\n    createdSuccessfully: '创建成功',\n    creationFailed: '创建失败',\n    noNetwork: '网络未连接',\n    noData: '暂无数据',\n  },\n  Handle: {\n    more: '更多',\n  },\n  Exception: {\n    '403': '很抱歉，暂无该页面访问权限',\n    '404': '很抱歉，本页暂无结果',\n    '500': '很抱歉，服务器报错',\n  },\n  TntdCascader: {\n    noData: '暂无数据',\n  },\n  PageLoading: {\n    text: '加载中...',\n  },\n  TntdSelect: {\n    noData: '暂无数据',\n  },\n  TntdSecondPage: {\n    back: '返回',\n  },\n  ColorPicker: {},\n  QueryForm: {\n    placeholder: '属性类型筛选',\n    yes: '是',\n    no: '否',\n    propTitle: '属性类型',\n    propValue: '属性类型值',\n  },\n  Drawer: {\n    okText: '确定',\n    cancelText: '取消',\n  },\n})\n\nexport default zh_CN\n"]}
+{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,UAAU;QAC9B,gBAAgB,EAAE,MAAM;QACxB,KAAK,EAAE,gBAAgB;KACxB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,mBAAmB,EAAE,MAAM;QAC3B,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,MAAM;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI;KACX;IACD,SAAS,EAAE;QACT,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,WAAW;KACnB;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM;KACf;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,MAAM,EAAE,MAAM;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,IAAI;KACX;IACD,WAAW,EAAE,EAAE;IACf,SAAS,EAAE;QACT,WAAW,EAAE,QAAQ;QACrB,GAAG,EAAE,GAAG;QACR,EAAE,EAAE,GAAG;QACP,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,OAAO;KACnB;IACD,MAAM,EAAE;QACN,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;KACjB;IACD,UAAU,EAAE;QACV,GAAG,EAAE,IAAI;KACV;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["import sourceLocale from 'antd/es/locale/zh_CN'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst zh_CN = merge(sourceLocale, {\n  Table: {\n    loadingDescription: '数据加载中...',\n    emptyDescription: '暂无数据',\n    total: '共 ${total} 条记录',\n  },\n  Empty: {\n    noGraphData: '暂无图表',\n    noPermission: '暂无权限',\n    createdSuccessfully: '创建成功',\n    creationFailed: '创建失败',\n    noNetwork: '网络未连接',\n    noData: '暂无数据',\n  },\n  Handle: {\n    more: '更多',\n  },\n  Exception: {\n    '403': '很抱歉，暂无该页面访问权限',\n    '404': '很抱歉，本页暂无结果',\n    '500': '很抱歉，服务器报错',\n  },\n  TntdCascader: {\n    noData: '暂无数据',\n  },\n  PageLoading: {\n    text: '加载中...',\n  },\n  TntdSelect: {\n    noData: '暂无数据',\n  },\n  TntdSecondPage: {\n    back: '返回',\n  },\n  ColorPicker: {},\n  QueryForm: {\n    placeholder: '属性类型筛选',\n    yes: '是',\n    no: '否',\n    propTitle: '属性类型',\n    propValue: '属性类型值',\n  },\n  Drawer: {\n    okText: '确定',\n    cancelText: '取消',\n  },\n  ArrayInput: {\n    add: '添加',\n  },\n})\n\nexport default zh_CN\n"]}

package/es/table/expand.less

@@ -1,7 +1,4 @@
 @table-prefix-cls: ~'@{ant-prefix}-table';
-@pagination-prefix-cls: ~'@{ant-prefix}-pagination';
-@spin-prefix-cls: ~'@{ant-prefix}-spin';
-@table-borderless-shadow: 0 0 14px rgba(0, 0, 0, 0.08);
 
 // .@{table-prefix-cls} {
 .tnt-table-wrapper {
@@ -15,7 +12,6 @@
         tr.@{table-prefix-cls}-expanded-row.@{table-prefix-cls}-expanded-row-level-1 {
           position: relative;
           z-index: 10;
-          background: #f3f4f6;
 
           > td:not([colspan]) {
             display: none;
@@ -23,29 +19,31 @@
 
           // 兼容低版本浏览器
           > td[colspan] {
-            background: #fff;
+            position: relative;
             z-index: 100;
             padding: 0;
-            border: none;
 
             > .@{table-prefix-cls}-expanded-row-fixed {
               position: sticky;
               left: 0px;
               overflow: hidden;
-              padding: 16px;
-              background: inherit;
-              border-top: 1px solid #e1e6ee;
+              padding: 0px 16px;
             }
           }
         }
       }
     }
 
-    .@{table-prefix-cls}-fixed-left table {
-      width: fit-content;
-    }
-    .@{table-prefix-cls}-fixed-right table {
+    .@{table-prefix-cls}-fixed-left table,  .@{table-prefix-cls}-fixed-right table {
       width: fit-content;
+
+      tr.@{table-prefix-cls}-expanded-row.@{table-prefix-cls}-expanded-row-level-1 {
+        > td {
+          position: relative;
+          z-index: -1;
+        }
+      }
     }
+   
   }
-}
+}

package/es/table/hooks/use-expand-fixed.js

@@ -18,11 +18,13 @@ export const useExpandFixed = () => {
   };
   const expand = async () => {
     const [main, right, left] = getDom(String(activeKeyRef.current) || '');
+    const border = 2;
+    const height = (main === null || main === void 0 ? void 0 : main.offsetHeight) - border || 0;
     if (right) {
-      right.setAttribute('style', `display: inline-block; height: ${(main === null || main === void 0 ? void 0 : main.offsetHeight) || 0}px; overflow: hidden;`);
+      right.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`);
     }
     if (left) {
-      left.setAttribute('style', `display: inline-block; height: ${(main === null || main === void 0 ? void 0 : main.offsetHeight) || 0}px; overflow: hidden;`);
+      left.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`);
     }
     if (main) {
       // 解决 expandIconAsCell为true 且 iconCell的td元素为display: none;时， 展开内容滚动到最右边，会多出一部分iconCell所占据的空间 的问题

package/es/table/hooks/use-expand-fixed.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-expand-fixed.js","sourceRoot":"","sources":["../../../src/table/hooks/use-expand-fixed.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useRef } from 'react'\nimport { makeRandomCode } from '../utils'\n\nexport type keyType = string | number | null\n\ninterface OldDom {\n  main: HTMLDivElement | null\n  right: HTMLDivElement | null\n  left: HTMLDivElement | null\n}\n\nexport const useExpandFixed = () => {\n  const curTableKey = useRef<keyType>(makeRandomCode())\n  const activeKeyRef = useRef<string | null>(null)\n  const oldActiveKeyRef = useRef<OldDom>({\n    main: null,\n    right: null,\n    left: null,\n  })\n  const container = useRef<HTMLDivElement | null>(null)\n  const observer = useRef<MutationObserver | null>(null)\n\n  const getDom = (key: string | number | undefined) => {\n    const main =\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-scroll [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement) ||\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-default [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement)\n    const right = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-right [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    const left = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-left [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    return [main, right, left]\n  }\n\n  const expand = async () => {\n    const [main, right, left] = getDom(String(activeKeyRef.current) || '')\n\n    if (right) {\n      right.setAttribute(\n        'style',\n        `display: inline-block; height: ${main?.offsetHeight || 0}px; overflow: hidden;`\n      )\n    }\n\n    if (left) {\n      left.setAttribute(\n        'style',\n        `display: inline-block; height: ${main?.offsetHeight || 0}px; overflow: hidden;`\n      )\n    }\n\n    if (main) {\n      // 解决 expandIconAsCell为true 且 iconCell的td元素为display: none;时， 展开内容滚动到最右边，会多出一部分iconCell所占据的空间 的问题\n      const td = main.childNodes[1] as HTMLDivElement\n\n      const colspan = td.getAttribute('colspan') || 0\n      const Oldcolspan = td.getAttribute('oldcolspan') || 0\n      const newColspan = Oldcolspan ? Oldcolspan : Number(colspan) + 1 + ''\n      if (!Oldcolspan) td.setAttribute('oldcolspan', newColspan)\n\n      td.setAttribute('colspan', newColspan)\n      //\n    }\n\n    oldActiveKeyRef.current = {\n      main,\n      right,\n      left,\n    }\n  }\n\n  const ob = () => {\n    const classname = curTableKey.current\n    if (!classname) return\n\n    container.current = document.querySelector(\n      `.${classname}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    ) as HTMLDivElement\n\n    observer.current = new MutationObserver(expand)\n    observer.current.observe(container.current, {\n      childList: true, // 子节点的变动\n      attributes: true,\n    })\n  }\n\n  const setChangedKey = (key: string) => {\n    activeKeyRef.current = key\n  }\n\n  const trigger = (key: string) => {\n    setChangedKey(key)\n    const className = curTableKey.current\n    if (!className) return\n    const dom = document?.querySelector(\n      `.${className}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    )\n    dom?.setAttribute('c-data', 'Mutation')\n  }\n\n  useEffect(() => {\n    ob()\n  }, [curTableKey.current])\n\n  return [curTableKey.current, trigger as (key: string) => void] as const\n}\n\nexport const findRowKey = (\n  record: any,\n  rowKey: string | ((record: any, index: number) => string)\n) => {\n  let res: string | number = ''\n  if (typeof rowKey === 'function') {\n    res = [record].map(rowKey)[0]\n  } else if (typeof rowKey === 'string') {\n    res = record[rowKey]\n  }\n\n  return res\n}\n"]}
+{"version":3,"file":"use-expand-fixed.js","sourceRoot":"","sources":["../../../src/table/hooks/use-expand-fixed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAUzC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG,MAAM,CAAU,cAAc,EAAE,CAAC,CAAA;IACrD,MAAM,YAAY,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAA;IAChD,MAAM,eAAe,GAAG,MAAM,CAAS;QACrC,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,IAAI;KACX,CAAC,CAAA;IACF,MAAM,SAAS,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAA;IAEtD,MAAM,MAAM,GAAG,CAAC,GAAgC,EAAE,EAAE;QAClD,MAAM,IAAI,GACP,QAAQ,CAAC,aAAa,CACrB,IAAI,WAAW,CAAC,OAAO,qCAAqC,GAAG,cAAc,CAC3D;YACnB,QAAQ,CAAC,aAAa,CACrB,IAAI,WAAW,CAAC,OAAO,sCAAsC,GAAG,cAAc,CAC5D,CAAA;QACtB,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAClC,IAAI,WAAW,CAAC,OAAO,0CAA0C,GAAG,cAAc,CACjE,CAAA;QACnB,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CACjC,IAAI,WAAW,CAAC,OAAO,yCAAyC,GAAG,cAAc,CAChE,CAAA;QACnB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QACtE,MAAM,MAAM,GAAG,CAAC,CAAA;QAChB,MAAM,MAAM,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,IAAG,MAAM,IAAI,CAAC,CAAA;QAC/C,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,kCAAkC,MAAM,uBAAuB,CAAC,CAAA;SAC7F;QAED,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,kCAAkC,MAAM,uBAAuB,CAAC,CAAA;SAC5F;QAED,IAAI,IAAI,EAAE;YACR,gGAAgG;YAChG,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAmB,CAAA;YAE/C,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAC/C,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;YACrD,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;YACrE,IAAI,CAAC,UAAU;gBAAE,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;YAE1D,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;YACtC,EAAE;SACH;QAED,eAAe,CAAC,OAAO,GAAG;YACxB,IAAI;YACJ,KAAK;YACL,IAAI;SACL,CAAA;IACH,CAAC,CAAA;IAED,MAAM,EAAE,GAAG,GAAG,EAAE;QACd,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAA;QACrC,IAAI,CAAC,SAAS;YAAE,OAAM;QAEtB,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC,aAAa,CACxC,IAAI,SAAS,iGAAiG,CAC7F,CAAA;QAEnB,QAAQ,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAC/C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE;YAC1C,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;QACpC,YAAY,CAAC,OAAO,GAAG,GAAG,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;QAC9B,aAAa,CAAC,GAAG,CAAC,CAAA;QAClB,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAA;QACrC,IAAI,CAAC,SAAS;YAAE,OAAM;QACtB,MAAM,GAAG,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,CACjC,IAAI,SAAS,iGAAiG,CAC/G,CAAA;QACD,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,EAAE,CAAA;IACN,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IAEzB,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,OAAgC,CAAU,CAAA;AACzE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,MAAW,EACX,MAAyD,EACzD,EAAE;IACF,IAAI,GAAG,GAAoB,EAAE,CAAA;IAC7B,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;QAChC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;KAC9B;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA","sourcesContent":["import { useEffect, useRef } from 'react'\nimport { makeRandomCode } from '../utils'\n\nexport type keyType = string | number | null\n\ninterface OldDom {\n  main: HTMLDivElement | null\n  right: HTMLDivElement | null\n  left: HTMLDivElement | null\n}\n\nexport const useExpandFixed = () => {\n  const curTableKey = useRef<keyType>(makeRandomCode())\n  const activeKeyRef = useRef<string | null>(null)\n  const oldActiveKeyRef = useRef<OldDom>({\n    main: null,\n    right: null,\n    left: null,\n  })\n  const container = useRef<HTMLDivElement | null>(null)\n  const observer = useRef<MutationObserver | null>(null)\n\n  const getDom = (key: string | number | undefined) => {\n    const main =\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-scroll [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement) ||\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-default [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement)\n    const right = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-right [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    const left = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-left [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    return [main, right, left]\n  }\n\n  const expand = async () => {\n    const [main, right, left] = getDom(String(activeKeyRef.current) || '')\n    const border = 2\n    const height = main?.offsetHeight - border || 0\n    if (right) {\n      right.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (left) {\n      left.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (main) {\n      // 解决 expandIconAsCell为true 且 iconCell的td元素为display: none;时， 展开内容滚动到最右边，会多出一部分iconCell所占据的空间 的问题\n      const td = main.childNodes[1] as HTMLDivElement\n\n      const colspan = td.getAttribute('colspan') || 0\n      const Oldcolspan = td.getAttribute('oldcolspan') || 0\n      const newColspan = Oldcolspan ? Oldcolspan : Number(colspan) + 1 + ''\n      if (!Oldcolspan) td.setAttribute('oldcolspan', newColspan)\n\n      td.setAttribute('colspan', newColspan)\n      //\n    }\n\n    oldActiveKeyRef.current = {\n      main,\n      right,\n      left,\n    }\n  }\n\n  const ob = () => {\n    const classname = curTableKey.current\n    if (!classname) return\n\n    container.current = document.querySelector(\n      `.${classname}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    ) as HTMLDivElement\n\n    observer.current = new MutationObserver(expand)\n    observer.current.observe(container.current, {\n      childList: true, // 子节点的变动\n      attributes: true,\n    })\n  }\n\n  const setChangedKey = (key: string) => {\n    activeKeyRef.current = key\n  }\n\n  const trigger = (key: string) => {\n    setChangedKey(key)\n    const className = curTableKey.current\n    if (!className) return\n    const dom = document?.querySelector(\n      `.${className}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    )\n    dom?.setAttribute('c-data', 'Mutation')\n  }\n\n  useEffect(() => {\n    ob()\n  }, [curTableKey.current])\n\n  return [curTableKey.current, trigger as (key: string) => void] as const\n}\n\nexport const findRowKey = (\n  record: any,\n  rowKey: string | ((record: any, index: number) => string)\n) => {\n  let res: string | number = ''\n  if (typeof rowKey === 'function') {\n    res = [record].map(rowKey)[0]\n  } else if (typeof rowKey === 'string') {\n    res = record[rowKey]\n  }\n\n  return res\n}\n"]}

package/es/table/table.js

@@ -10,12 +10,11 @@ var __rest = this && this.__rest || function (s, e) {
 };
 import { ConfigConsumer } from 'antd/es/config-provider';
 import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
-import Icon from '../icon/index';
 import { default as AntdTable } from 'antd/es/table';
 import Column from 'antd/es/table/Column';
 import ColumnGroup from 'antd/es/table/ColumnGroup';
 import classNames from 'classnames';
-import React, { useMemo, useRef } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import Ellipsis from '../ellipsis';
 import { TableContext } from './context';
 import { useColumnSetting, useExpandFixed } from './hooks';
@@ -57,7 +56,7 @@ export const Table = _a => {
       storageKey,
       columns,
       children,
-      sticky = true,
+      sticky = false,
       shadowed,
       striped = true,
       showCellBorders = false,
@@ -68,16 +67,11 @@ export const Table = _a => {
       unUpperConverted,
       // 强制不要转换
       unTooltip,
-      onExpandedRowsChange,
-      expandedRowRender,
-      // expandedRowKeys = [],
-      onExpand,
-      rowClassName,
-      smallPadding
+      smallPadding,
+      rowClassName
     } = _a,
-    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "sticky", "shadowed", "striped", "showCellBorders", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip", "onExpandedRowsChange", "expandedRowRender", "onExpand", "rowClassName", "smallPadding"]);
+    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "sticky", "shadowed", "striped", "showCellBorders", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip", "smallPadding", "rowClassName"]);
   const tableContainer = useRef(null);
-  const tableContainerWidth = React.useRef(0);
   // const [innerSize, setInnerSize] = useLocalStorage<TableProps<T>['size']>(
   //   TABLE_SIZE_STORAGE_KEY,
   //   'default'
@@ -110,6 +104,7 @@ export const Table = _a => {
     }
     return rowClassName;
   };
+  const [fixedWidth, setFixedWidth] = useState(Number);
   const lang = getLanguage();
   let newColumns = displayColumns;
   //   非中文做处理
@@ -193,87 +188,25 @@ export const Table = _a => {
    * expand 与 fix 兼容，expand悬浮
    */
   const [tableKey, trigger] = useExpandFixed();
-  // 自定义展开收起
-  const customExpandIcon = p => {
-    const {
-      expanded
-    } = p;
-    if (expanded) {
-      return React.createElement("span", {
-        style: {
-          marginLeft: !rest.rowSelection ? '0px' : undefined,
-          paddingLeft: !rest.rowSelection ? '0px' : undefined
-        },
-        className: "expand",
-        onClick: e => {
-          e.stopPropagation();
-          p === null || p === void 0 ? void 0 : p.onExpand(p.record, e);
-          if (onExpand) onExpand(p.expanded, p.record);
-        }
-      }, React.createElement(Icon, {
-        type: "minus-square"
-      }));
-    }
-    return React.createElement("span", {
-      style: {
-        marginLeft: !rest.rowSelection ? '0px' : undefined,
-        paddingLeft: !rest.rowSelection ? '0px' : undefined
-      },
-      className: "expand",
-      onClick: e => {
-        e.stopPropagation();
-        p === null || p === void 0 ? void 0 : p.onExpand(p.record, e);
-        if (onExpand) onExpand(p.expanded, p.record);
-      }
-    }, React.createElement(Icon, {
-      type: "plus-square"
-    }));
-  };
-  const expandIconColumnIndex = (rest === null || rest === void 0 ? void 0 : rest.rowSelection) ? 1 : rest.expandIconColumnIndex || 0; // 确定checkbox框位置
-  // 设置expandIcon的默认值
-  let expandIcon = rest.expandIcon;
-  if (expandedRowRender && !rest.expandIcon) {
-    expandIcon = props => customExpandIcon(Object.assign(Object.assign({}, props), {
-      needIndentSpaced: true
-    }));
-  } else if (!expandedRowRender) {
-    expandIcon = undefined;
-  }
-  // const [activeKeys, setActiveKeys] = React.useState<string[] | number[] | []>(
-  //   expandedRowKeys.splice(0, 1) as string[] | number[] | []
-  // )
   const stickyProps = useMemo(() => {
     return {
       onExpandedRowsChange: arg => {
         const key = arg && arg[arg.length - 1];
-        if (onExpandedRowsChange) onExpandedRowsChange([Number(key)]);
+        if (rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange) rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange([Number(key)]);
         // 触发MutationObserver监听
         trigger(key);
       },
-      expandedRowRender: expandedRowRender ? (record, index, indent, expanded) => {
+      expandedRowRender: (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender) ? (record, index, indent, expanded) => {
         const padding = 0;
         return React.createElement("div", {
           className: "ant-table-expanded-row-fixed",
           style: {
-            width: tableContainerWidth.current + padding
+            width: fixedWidth + padding
           }
-        }, expandedRowRender && expandedRowRender(record, index, indent, expanded));
-      } : undefined,
-      expandIconAsCell: true,
-      expandIconColumnIndex: expandIconColumnIndex,
-      expandIcon: expandIcon
-      // expandedRowKeys: activeKeys,
-      // onExpand: (expanded: boolean, record: any) => {
-      //   const rowKeys: string[] | number[] = [findRowKey(record, rest.rowKey || 'key')] as
-      //     | string[]
-      //     | number[]
-      //   setActiveKeys(expanded ? rowKeys : [])
-      // },
+        }, (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender) && (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender(record, index, indent, expanded)));
+      } : undefined
     };
-  }, [expandedRowRender, expandIconColumnIndex, expandIcon,
-  // activeKeys,
-  // rest.rowKey,
-  onExpandedRowsChange, trigger]);
+  }, [rest === null || rest === void 0 ? void 0 : rest.expandedRowRender, rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange, trigger]);
   return React.createElement(TableContext.Provider, {
     value: {
       // size: innerSize,
@@ -300,7 +233,7 @@ export const Table = _a => {
         onResize: ({
           width
         }) => {
-          tableContainerWidth.current = width;
+          setFixedWidth(width);
         }
       }, React.createElement(AntdTable, Object.assign({
         className: classNames(
@@ -313,8 +246,8 @@ export const Table = _a => {
           [`${prefixCls}-striped`]: striped,
           [`${prefixCls}-shadowed`]: shadowed,
           [`${prefixCls}-has-footer`]: rest.footer,
-          [`${prefixCls}-sticky`]: sticky,
-          [`${prefixCls}-small-padding`]: smallPadding
+          [`${prefixCls}-small-padding`]: smallPadding,
+          [`${prefixCls}-sticky`]: sticky
         }, className),
         locale: locale,
         bordered: bordered,