linkmore-design 1.1.10 → 1.1.12

package/lib/LmEditTable/EditTable.js

@@ -29,6 +29,8 @@ var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _ahooks = require("ahooks");
+
 var _immer = require("immer");
 
 var _DndContainer = _interopRequireDefault(require("./DndContainer"));
@@ -269,11 +271,21 @@ var Opetate = function Opetate(_ref) {
       options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options,
       getLength = _ref.getLength,
       quickOpetateClearAll = _ref.quickOpetateClearAll;
+
+  var appendChildren = function appendChildren() {
+    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record, true);
+  };
+
+  var appendAdd = function appendAdd() {
+    handleAdd === null || handleAdd === void 0 ? void 0 : handleAdd(record);
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       display: 'flex',
       alignItems: 'center',
-      justifyContent: 'center'
+      justifyContent: 'flex-start',
+      marginLeft: '-4px'
     }
   }, options.includes('delete') && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
@@ -288,7 +300,27 @@ var Opetate = function Opetate(_ref) {
     onClick: function onClick() {
       return handleDelete(record[rowKey]);
     }
-  }), options.includes('add') && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }), (options === null || options === void 0 ? void 0 : options.includes('add')) && (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Popover, {
+    placement: "bottom",
+    overlayClassName: 'lm_table_append_add_popover',
+    open: open,
+    title: null,
+    content: /*#__PURE__*/_react.default.createElement("ul", null, /*#__PURE__*/_react.default.createElement("li", {
+      onClick: appendAdd
+    }, "\u6DFB\u52A0\u5E73\u7EA7"), /*#__PURE__*/_react.default.createElement("li", {
+      onClick: appendChildren
+    }, "\u6DFB\u52A0\u5B50\u7EA7")),
+    trigger: "hover"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "link",
+    size: "small",
+    icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: "lmweb-plus-circle-fill",
+      style: {
+        fontSize: 16
+      }
+    })
+  })) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -298,7 +330,7 @@ var Opetate = function Opetate(_ref) {
       }
     }),
     onClick: function onClick() {
-      return handleAdd(record);
+      return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
     }
   }));
 }; // const isValidValue = (verifyValue) => {
@@ -715,35 +747,39 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       recordCreatorProps = props.recordCreatorProps,
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
-      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]);
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
 
-  var _useState5 = (0, _react.useState)([]),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      dataSource = _useState6[0],
-      setDataSource = _useState6[1]; // const [count, setCount] = useState(0);
 
+  var _useControllableValue = (0, _ahooks.useControllableValue)({
+    value: (0, _util.checkRowKeyByDataSource)(props.value, _rowKey),
+    onChange: props.onChange
+  }),
+      _useControllableValue2 = (0, _slicedToArray2.default)(_useControllableValue, 2),
+      dataSource = _useControllableValue2[0],
+      setDataSource = _useControllableValue2[1]; // const [count, setCount] = useState(0);
 
-  var _useState7 = (0, _react.useState)({}),
+
+  var _useState5 = (0, _react.useState)({}),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      _valid = _useState6[0],
+      setValid = _useState6[1];
+
+  var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      _valid = _useState8[0],
-      setValid = _useState8[1];
+      localRowSelectList = _useState8[0],
+      setLocalRowSelectList = _useState8[1];
 
   var _useState9 = (0, _react.useState)([]),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      localRowSelectList = _useState10[0],
-      setLocalRowSelectList = _useState10[1];
-
-  var _useState11 = (0, _react.useState)([]),
-      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      sortEditTable = _useState12[0],
-      setCallBackFalg = _useState12[1];
+      sortEditTable = _useState10[0],
+      setCallBackFalg = _useState10[1];
   /** 当前展开的列 */
 
 
-  var _useState13 = (0, _react.useState)([]),
-      _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      expandedRowKeys = _useState14[0],
-      setExpandedRowKeys = _useState14[1];
+  var _useState11 = (0, _react.useState)([]),
+      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+      expandedRowKeys = _useState12[0],
+      setExpandedRowKeys = _useState12[1];
 
   var dataSourceRef = (0, _react.useRef)([]);
   var sortDataSorceRef = (0, _react.useRef)([]);
@@ -757,12 +793,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var newIndex = cloneArr.findIndex(function (v) {
       return v[_rowKey] === over;
     });
-
-    if (onChange) {
-      onChange === null || onChange === void 0 ? void 0 : onChange((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
-    } else {
-      setDataSource((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
-    }
+    setDataSource((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
   };
 
   var onColSortEnd = function onColSortEnd(active, over) {
@@ -785,8 +816,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var handleDelete = function handleDelete(key) {
     var nValue = dataSource.filter(function (item) {
       return item[_rowKey] !== key;
-    });
-    onChange === null || onChange === void 0 ? void 0 : onChange(nValue);
+    }); // onChange?.(nValue)
+
+    setDataSource(nValue);
   };
   /** 点击添加按钮添加 */
 
@@ -798,14 +830,14 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
       draft.push(Object.assign((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
     });
-    setDataSource(res);
-    onChange === null || onChange === void 0 ? void 0 : onChange(res);
+    setDataSource(res); // onChange?.(res)
   };
 
   (0, _react.useEffect)(function () {
     var _a;
 
     dataSourceRef.current = dataSource;
+    deepDataSourceRef.current = (0, _util.deepDataSourcePreKeys)(dataSource, _rowKey);
 
     if (sortOpen) {
       var dataSourceKeys = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
@@ -910,12 +942,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       }
     });
-
-    if (onChange) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(res);
-    } else {
-      setDataSource(res);
-    }
+    setDataSource(res);
   };
 
   var reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
@@ -956,12 +983,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       };
 
       var res = filter(dataSource, key);
-
-      if (onChange) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(res);
-      } else {
-        setDataSource(res);
-      }
+      setDataSource(res);
     } else {
       if (((_c = dataSourceRef.current) === null || _c === void 0 ? void 0 : _c.length) === 1 && !quickOpetateClearAll) {
         return false;
@@ -977,27 +999,37 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
 
-      if (onChange) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(_res);
-      } else {
-        setDataSource(_res);
-      }
+      setDataSource(_res);
     }
   };
   /** 快捷添加 */
 
 
-  var handleTableRowAdd = function handleTableRowAdd(record) {
+  var handleTableRowAdd = function handleTableRowAdd(record, isAppendInChindren) {
     var _a, _b;
 
     var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+      var _a, _b, _c, _d;
+
       if (preKeys.length > 1) {
         var deeps = function deeps(children) {
           children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
+            var _a;
+
             if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
               if (item[_rowKey] === record[_rowKey]) {
-                children.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                if (isAppendInChindren) {
+                  if (item === null || item === void 0 ? void 0 : item.children) {
+                    (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.push((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                  } else {
+                    item.children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+                  }
+
+                  !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [item[_rowKey]]));
+                } else {
+                  children.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                }
               } else if (item.children) {
                 deeps(item.children);
               }
@@ -1012,16 +1044,21 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         });
 
         if (index !== -1) {
-          draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+          if (isAppendInChindren) {
+            if ((_a = draft[index].children) === null || _a === void 0 ? void 0 : _a.length) {
+              (_b = draft[index].children) === null || _b === void 0 ? void 0 : _b.push((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+            } else {
+              draft[index].children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+            }
+
+            !expandedRowKeys.includes((_c = draft[index]) === null || _c === void 0 ? void 0 : _c[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [(_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]]));
+          } else {
+            draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+          }
         }
       }
     });
-
-    if (onChange) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(res);
-    } else {
-      setDataSource(res);
-    }
+    setDataSource(res);
   };
 
   var handleCopy = function handleCopy(key, value) {
@@ -1030,12 +1067,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return item[key] = value;
       });
     });
-
-    if (onChange) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(res);
-    } else {
-      setDataSource(res);
-    }
+    setDataSource(res);
   };
   /** 判断columne中有没有带optionOnly参数  */
 
@@ -1059,9 +1091,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var DisableOptions = (0, _react.useMemo)(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref3 = item.componentProps || {},
-          optionOnly = _ref3.optionOnly,
-          options = _ref3.options;
+      var _ref5 = item.componentProps || {},
+          optionOnly = _ref5.optionOnly,
+          options = _ref5.options;
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1108,6 +1140,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       width: 68,
       fixed: 'right',
       editable: 'lm_edit_opetate',
+      className: 'lm_edit_opetate',
       componentProps: {
         options: Array.isArray(useQuickOpetate) ? useQuickOpetate : ['add', 'delete']
       }
@@ -1151,7 +1184,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               editable = col.editable,
               relevanceCols = col.relevanceCols;
 
-          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options) || editable === 'render' || !!relevanceCols || !!shouldUpdate) {
+          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options) || editable === 'render' || !!relevanceCols || !!shouldUpdate || !!record.children) {
             return true;
           }
 
@@ -1255,34 +1288,6 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       components: component
     }, resetProps);
   }, [resultColumns, dataSource, sortOpen, colSortOpen, size]);
-  (0, _react.useEffect)(function () {
-    // setDataSource(defaultData?.map((v, idx) => ({ ...v, [rowKey]: v[rowKey] || `v${idx + 1}` })))
-    var addRowKey = function addRowKey(children, pkey) {
-      return children === null || children === void 0 ? void 0 : children.map(function (item, index) {
-        if (item.children) {
-          var _Object$assign5;
-
-          var rchildren = addRowKey(item.children, "".concat(pkey, "_").concat(index + 1));
-          return Object.assign(Object.assign({}, item), (_Object$assign5 = {}, (0, _defineProperty2.default)(_Object$assign5, _rowKey, item[_rowKey] || "".concat(pkey, "_").concat(index + 1)), (0, _defineProperty2.default)(_Object$assign5, "children", rchildren), _Object$assign5));
-        }
-
-        return Object.assign(Object.assign({}, item), (0, _defineProperty2.default)({}, _rowKey, item[_rowKey] || "".concat(pkey, "_").concat(index + 1)));
-      });
-    };
-
-    var res = defaultData === null || defaultData === void 0 ? void 0 : defaultData.map(function (v, idx) {
-      if (v.children) {
-        var _Object$assign7;
-
-        var rchildren = addRowKey(v.children, v[_rowKey] || "v".concat(idx + 1));
-        return Object.assign(Object.assign({}, v), (_Object$assign7 = {}, (0, _defineProperty2.default)(_Object$assign7, _rowKey, v[_rowKey] || "v".concat(idx + 1)), (0, _defineProperty2.default)(_Object$assign7, "children", rchildren), _Object$assign7));
-      }
-
-      return Object.assign(Object.assign({}, v), (0, _defineProperty2.default)({}, _rowKey, v[_rowKey] || "v".concat(idx + 1)));
-    });
-    deepDataSourceRef.current = (0, _util.deepDataSourcePreKeys)(res, _rowKey);
-    setDataSource(res);
-  }, [defaultData]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setRow: handleSave,

package/lib/LmEditTable/style/index.css

@@ -198,6 +198,7 @@
   --font-size-base: 14px;
   --font-size-lg: calc(var(--font-size-base) + 2px);
   --font-size-sm: 12px;
+  --border-radius: 2px;
   --color-contrast: #fff;
   --color-100: #000;
   --color-85: #262626;
@@ -579,6 +580,10 @@ p {
 .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
   padding: 0 !important;
 }
+.lm_editTable_warpper .lm_edit_opetate {
+  padding-left: 8px;
+  padding-right: 8px;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -604,3 +609,21 @@ p {
   color: var(--color-85);
   margin-left: 0 !important;
 }
+.lm_table_append_add_popover .ant-popover-inner-content {
+  padding: 0px;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul {
+  margin: 0;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li {
+  font-size: 12px;
+  padding: 4px 8px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
+  background-color: var(--color-15);
+}

package/lib/LmEditTable/style/variables.css

@@ -68,6 +68,10 @@
 .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
   padding: 0 !important;
 }
+.lm_editTable_warpper .lm_edit_opetate {
+  padding-left: 8px;
+  padding-right: 8px;
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;
@@ -93,3 +97,21 @@
   color: var(--color-85);
   margin-left: 0 !important;
 }
+.lm_table_append_add_popover .ant-popover-inner-content {
+  padding: 0px;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul {
+  margin: 0;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li {
+  font-size: 12px;
+  padding: 4px 8px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
+  background-color: var(--color-15);
+}

package/lib/LmEditTable/util.d.ts

@@ -1,6 +1,7 @@
 export declare function isObjEmpty(obj: Record<string, any>): boolean;
 export declare function deepDataSourcePreKeys(dataSource: any[], rowKey: string): any;
 export declare function isExpandRow(children: any): boolean;
+export declare function checkRowKeyByDataSource(dataSource: any, rowKey: any): any;
 declare const _default: {
     isObjEmpty: typeof isObjEmpty;
 };

package/lib/LmEditTable/util.js

@@ -5,11 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkRowKeyByDataSource = checkRowKeyByDataSource;
 exports.deepDataSourcePreKeys = deepDataSourcePreKeys;
 exports.default = void 0;
 exports.isExpandRow = isExpandRow;
 exports.isObjEmpty = isObjEmpty;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _lodash = require("lodash");
@@ -45,6 +48,33 @@ function isExpandRow(children) {
   return ['Collapse row', 'Expand row'].includes((_e = (_d = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.children) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e['aria-label']);
 }
 
+function checkRowKeyByDataSource(dataSource, rowKey) {
+  var addRowKey = function addRowKey(children, pkey) {
+    return children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+      if (item.children) {
+        var _Object$assign;
+
+        var rchildren = addRowKey(item.children, "".concat(pkey, "_").concat(index + 1));
+        return Object.assign(Object.assign({}, item), (_Object$assign = {}, (0, _defineProperty2.default)(_Object$assign, rowKey, item[rowKey] || "".concat(pkey, "_").concat(index + 1)), (0, _defineProperty2.default)(_Object$assign, "children", rchildren), _Object$assign));
+      }
+
+      return Object.assign(Object.assign({}, item), (0, _defineProperty2.default)({}, rowKey, item[rowKey] || "".concat(pkey, "_").concat(index + 1)));
+    });
+  };
+
+  var res = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (v, idx) {
+    if (v.children) {
+      var _Object$assign3;
+
+      var rchildren = addRowKey(v.children, v[rowKey] || "v".concat(idx + 1));
+      return Object.assign(Object.assign({}, v), (_Object$assign3 = {}, (0, _defineProperty2.default)(_Object$assign3, rowKey, v[rowKey] || "v".concat(idx + 1)), (0, _defineProperty2.default)(_Object$assign3, "children", rchildren), _Object$assign3));
+    }
+
+    return Object.assign(Object.assign({}, v), (0, _defineProperty2.default)({}, rowKey, v[rowKey] || "v".concat(idx + 1)));
+  });
+  return res;
+}
+
 var _default = {
   isObjEmpty: isObjEmpty
 };

package/lib/LmSelect/style/index.css

@@ -198,6 +198,7 @@
   --font-size-base: 14px;
   --font-size-lg: calc(var(--font-size-base) + 2px);
   --font-size-sm: 12px;
+  --border-radius: 2px;
   --color-contrast: #fff;
   --color-100: #000;
   --color-85: #262626;

package/lib/LmTable/style/index.css

@@ -198,6 +198,7 @@
   --font-size-base: 14px;
   --font-size-lg: calc(var(--font-size-base) + 2px);
   --font-size-sm: 12px;
+  --border-radius: 2px;
   --color-contrast: #fff;
   --color-100: #000;
   --color-85: #262626;

package/lib/Locale/default.d.ts

@@ -1,3 +1,6 @@
 import type { Locale } from 'antd/es/locale-provider';
-declare const localeValues: Locale;
+interface ILocal extends Locale {
+    CustomTableOption?: any;
+}
+declare const localeValues: ILocal;
 export default localeValues;

package/lib/Locale/default.js

@@ -15,6 +15,8 @@ var _en_US3 = _interopRequireDefault(require("antd/es/date-picker/locale/en_US")
 
 var _en_US4 = _interopRequireDefault(require("antd/es/time-picker/locale/en_US"));
 
+var _en_US5 = _interopRequireDefault(require("../CustomTableOption/locale/en_US"));
+
 /* eslint-disable no-template-curly-in-string */
 var typeTemplate = '${label} is not a valid ${type}';
 var localeValues = {
@@ -140,7 +142,8 @@ var localeValues = {
   },
   Image: {
     preview: 'Preview'
-  }
+  },
+  CustomTableOption: _en_US5.default
 };
 var _default = localeValues;
 exports.default = _default;

package/lib/Locale/zh_CN.d.ts

@@ -1,3 +1,6 @@
 import type { Locale } from 'antd/es/locale-provider';
-declare const localeValues: Locale;
+interface ILocal extends Locale {
+    CustomTableOption?: any;
+}
+declare const localeValues: ILocal;
 export default localeValues;

package/lib/Locale/zh_CN.js

@@ -15,6 +15,8 @@ var _zh_CN3 = _interopRequireDefault(require("antd/es/date-picker/locale/zh_CN")
 
 var _zh_CN4 = _interopRequireDefault(require("antd/es/time-picker/locale/zh_CN"));
 
+var _zh_CN5 = _interopRequireDefault(require("../CustomTableOption/locale/zh_CN"));
+
 /* eslint-disable no-template-curly-in-string */
 var typeTemplate = '${label}不是一个有效的${type}';
 var localeValues = {
@@ -139,7 +141,8 @@ var localeValues = {
   },
   Image: {
     preview: '预览'
-  }
+  },
+  CustomTableOption: _zh_CN5.default
 };
 var _default = localeValues;
 exports.default = _default;

package/lib/Mentions/style/index.css

@@ -198,6 +198,7 @@
   --font-size-base: 14px;
   --font-size-lg: calc(var(--font-size-base) + 2px);
   --font-size-sm: 12px;
+  --border-radius: 2px;
   --color-contrast: #fff;
   --color-100: #000;
   --color-85: #262626;

package/lib/Menu/style/index.css

@@ -198,6 +198,7 @@
   --font-size-base: 14px;
   --font-size-lg: calc(var(--font-size-base) + 2px);
   --font-size-sm: 12px;
+  --border-radius: 2px;
   --color-contrast: #fff;
   --color-100: #000;
   --color-85: #262626;

package/lib/Modal/index.js

@@ -19,6 +19,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _SizeContext = _interopRequireDefault(require("../ConfigProvider/SizeContext"));
 
+var _LocaleReceiver = _interopRequireDefault(require("../locale-provider/LocaleReceiver"));
+
+var _locale = require("./locale");
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -40,34 +44,38 @@ var CLMModal = function CLMModal(props) {
       size = _props$size === void 0 ? 'default' : _props$size,
       onOk = props.onOk,
       onCancel = props.onCancel,
-      _props$okText = props.okText,
-      okText = _props$okText === void 0 ? '确定' : _props$okText,
-      _props$cancelText = props.cancelText,
-      cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
       visible = props.visible,
       open = props.open,
-      other = __rest(props, ["wrapClassName", "size", "onOk", "onCancel", "okText", "cancelText", "visible", "open"]);
+      other = __rest(props, ["wrapClassName", "size", "onOk", "onCancel", "visible", "open"]);
 
   var defaultFooterSize = _react.default.useContext(_SizeContext.default) || 'middle';
-  return /*#__PURE__*/_react.default.createElement(_modal.default, Object.assign({
-    wrapClassName: (0, _classnames.default)(wrapClassName, prefixCls),
-    width: size === 'default' ? 552 : 416,
-    footer: [/*#__PURE__*/_react.default.createElement(_Button.default, {
+
+  var defaultFooter = /*#__PURE__*/_react.default.createElement(_LocaleReceiver.default, {
+    componentName: "Modal",
+    defaultLocale: (0, _locale.getConfirmLocale)()
+  }, function (contextLocale) {
+    var okText = props.okText,
+        cancelText = props.cancelText;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Button.default, Object.assign({
       onClick: onCancel,
       key: 'canncel_button',
       size: defaultFooterSize
-    }, cancelText), /*#__PURE__*/_react.default.createElement(_Button.default, {
+    }, props.cancelButtonProps), cancelText || contextLocale.cancelText), /*#__PURE__*/_react.default.createElement(_Button.default, Object.assign({
       type: "primary",
       onClick: onOk,
       key: 'ok_button',
       size: defaultFooterSize
-    }, okText)]
+    }, props.okButtonProps), okText !== null && okText !== void 0 ? okText : contextLocale.okText));
+  });
+
+  return /*#__PURE__*/_react.default.createElement(_modal.default, Object.assign({
+    wrapClassName: (0, _classnames.default)(wrapClassName, prefixCls),
+    width: size === 'default' ? 552 : 416,
+    footer: defaultFooter
   }, other, {
     onOk: onOk,
     onCancel: onCancel,
-    okText: okText,
-    visible: visible || open,
-    cancelText: cancelText
+    visible: visible || open
   }));
 };
 

package/lib/Modal/locale.d.ts

@@ -0,0 +1,7 @@
+export interface ModalLocale {
+    okText: string;
+    cancelText: string;
+    justOkText: string;
+}
+export declare function changeConfirmLocale(newLocale?: ModalLocale): void;
+export declare function getConfirmLocale(): ModalLocale;